<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/90f5479296f794baa037f6ec5a7121ab1d61d981">https://github.com/macports/macports-ports/commit/90f5479296f794baa037f6ec5a7121ab1d61d981</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 90f5479296f gkrellm: update to 2.3.11 + master patches
</span>90f5479296f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 90f5479296f794baa037f6ec5a7121ab1d61d981
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Mon Apr 17 17:24:17 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> gkrellm: update to 2.3.11 + master patches
</span>---
sysutils/gkrellm/Portfile | 14 +-
.../gkrellm/files/patch-2.11-master-commits.diff | 893 +++++++++++++++++++++
sysutils/gkrellm/files/patch-master-commits.diff | 530 ------------
3 files changed, 901 insertions(+), 536 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/gkrellm/Portfile b/sysutils/gkrellm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a7153b14803..9069694c75b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/gkrellm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/gkrellm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name gkrellm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.3.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories sysutils
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,11 +14,13 @@ description A GTK based system monitor
</span>
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://gkrellm.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gkrellm.net invalid 2023 - Author Bill Wilson RIP 2022
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://gkrellm.srcbox.net
</span> master_sites http://gkrellm.srcbox.net/releases/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d482fe1688e458fc517b0bee6411ab5c3082a771 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8b9ec8baadcd5830c6aff04ba86dc9ed317a15c1c3787440bd1e680fb2fcd766
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0fa58d3a4bf861b3dd5c3b6aecdcda06ce18fabe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1ee0643ed9ed99f88c1504c89d9ccb20780cf29319c904b68e80a8e7c8678c06 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 783123
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +30,7 @@ depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
</span> port:xorg-libsm
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-master-commits.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-2.11-master-commits.diff
</span>
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/gkrellm/files/patch-2.11-master-commits.diff b/sysutils/gkrellm/files/patch-2.11-master-commits.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a07bfa73980
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/gkrellm/files/patch-2.11-master-commits.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,893 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --color=auto -Naur gkrellm-2.3.11/server/main.c gkrellm/server/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gkrellm-2.3.11/server/main.c 2019-07-25 09:51:21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gkrellm/server/main.c 2023-04-17 16:49:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gkrellmd-private.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "log-private.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "../src/inet.h" // for INET6 define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <syslog.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // !WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -473,22 +475,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addr = inet_ntoa(((struct sockaddr_in *)sa)->sin_addr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_debug(DEBUG_SERVER, "Connect from %s[%s]\n", hostname ? hostname : "[unknown]", addr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ client->hostname = g_strdup(hostname ? hostname : addr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!allow_host_list)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_debug(DEBUG_SERVER, "Client %s[%s] allowed, no allowed hosts list\n", (hostname ? hostname : "[unknown]"), addr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (list = allow_host_list; list; list = list->next)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allowed = (gchar *) list->data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( (hostname && !strcmp(hostname, allowed))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- || (addr && !strcmp(addr, allowed))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- || !strcmp("ALL", allowed)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!strcmp("ALL", allowed))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_debug(DEBUG_SERVER, "Client %s[%s] matches ALL\n", (hostname ? hostname : "[unknown]"), addr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (hostname && !strcmp(hostname, allowed))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_debug(DEBUG_SERVER, "Client %s[%s] matches hostname %s\n", (hostname ? hostname : "[unknown]"), addr, allowed);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (addr && !strcmp(addr, allowed))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_debug(DEBUG_SERVER, "Client %s[%s] matches address %s\n", (hostname ? hostname : "[unknown]"), addr, allowed);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (addr && cidr_match(sa, salen, allowed))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_debug(DEBUG_SERVER, "Client %s[%s] matches CIDR address %s\n", (hostname ? hostname : "[unknown]"), addr, allowed);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Check for simple IPv4 subnet match. Worry later about ranges and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | other hosts_access type patterns.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -498,7 +521,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && *(s + 1) == '*' && *(s + 2) == '\0'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !strncmp(addr, allowed, (gint) (s - allowed + 1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_debug(DEBUG_SERVER, "Client %s[%s] matches IPv4 wildcard %s\n", (hostname ? hostname : "[unknown]"), addr, allowed);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_debug(DEBUG_SERVER, "Client %s[%s] not matched by %s\n", (hostname ? hostname : "[unknown]"), addr, allowed);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ snprintf(buf, sizeof(buf), _("Connection not allowed from %s\n"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --color=auto -Naur gkrellm-2.3.11/src/clock.c gkrellm/src/clock.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gkrellm-2.3.11/src/clock.c 2019-07-25 09:49:59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gkrellm/src/clock.c 2023-04-17 16:49:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* GKrellM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-| Copyright (C) 1999-2019 Bill Wilson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++| Copyright (C) 1999-2021 Bill Wilson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | Author: Bill Wilson billw@gkrellm.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | Latest versions might be found at: http://gkrellm.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -272,6 +272,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cal_string = strftime_format(cal_format, cal_alt_color_string);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_cal = gkrellm_create_decal_text_markup(pcal, cal_string,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_meter_textstyle(cal_style_id), style, -1, -1, -1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Calendar formats with %n have multiple lines which should be centered.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_cal->flags |= DF_TEXT_CENTER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free(cal_string);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_panel_configure(pcal, NULL, style);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -378,6 +381,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clock_string = strftime_format(clock_format, clock_alt_color_string);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_clock = gkrellm_create_decal_text_markup(pclock, clock_string,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_meter_textstyle(clock_style_id), style, -1, -1, -1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Clock formats with %n have multiple lines which should be centered.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_clock->flags |= DF_TEXT_CENTER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free(clock_string);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_panel_configure(pclock, NULL, style);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --color=auto -Naur gkrellm-2.3.11/src/gkrellm.h gkrellm/src/gkrellm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gkrellm-2.3.11/src/gkrellm.h 2019-07-25 09:49:59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gkrellm/src/gkrellm.h 2023-04-17 16:49:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* GKrellM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-| Copyright (C) 1999-2019 Bill Wilson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++| Copyright (C) 1999-2021 Bill Wilson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | Author: Bill Wilson billw@gkrellm.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | Latest versions might be found at: http://gkrellm.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -262,8 +262,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DF_LOCAL_PIXMAPS 0x4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DF_OVERLAY_PIXMAPS 0x8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DF_TEXT_OVERLAPS 0x10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define DF_SCROLL_TEXT_DIVERTED 0x20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define DF_SCROLL_TEXT_CENTER 0x40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define DF_TEXT_CENTER 0x20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define DF_SCROLL_TEXT_DIVERTED 0x40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DF_SCROLL_TEXT_H_LOOP 0x80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DF_SCROLL_TEXT_V_LOOP 0x100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DF_TEXT_USE_MARKUP 0x200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --color=auto -Naur gkrellm-2.3.11/src/krell.c gkrellm/src/krell.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gkrellm-2.3.11/src/krell.c 2019-07-25 09:49:59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gkrellm/src/krell.c 2023-04-17 16:49:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* GKrellM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-| Copyright (C) 1999-2019 Bill Wilson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++| Copyright (C) 1999-2021 Bill Wilson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | Author: Bill Wilson billw@gkrellm.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | Latest versions might be found at: http://gkrellm.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -542,14 +542,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!d)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- prev_center = d->flags & DF_SCROLL_TEXT_CENTER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prev_center = d->flags & DF_TEXT_CENTER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((center && prev_center) || (!center && !prev_center))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (center)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- d->flags |= DF_SCROLL_TEXT_CENTER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d->flags |= DF_TEXT_CENTER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- d->flags &= ~DF_SCROLL_TEXT_CENTER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d->flags &= ~DF_TEXT_CENTER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d->modified = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -612,7 +612,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ts = &d->text_style;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ layout = gtk_widget_create_pango_layout(gkrellm_get_top_window(), NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pango_layout_set_spacing(layout, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (d->flags & DF_SCROLL_TEXT_CENTER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (d->flags & DF_TEXT_CENTER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pango_layout_set_font_description(layout, ts->font);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (d->flags & DF_TEXT_USE_MARKUP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -757,7 +757,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dx >= 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pixbuf = gdk_pixbuf_get_from_drawable(NULL, p->bg_pixmap, NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- d->x + ((d->flags & DF_SCROLL_TEXT_CENTER) ? dx / 2 : 0), d->y,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d->x + ((d->flags & DF_TEXT_CENTER) ? dx / 2 : 0), d->y,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0, 0, d->scroll_width, d->h);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --color=auto -Naur gkrellm-2.3.11/src/mail.c gkrellm/src/mail.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gkrellm-2.3.11/src/mail.c 2019-07-25 09:49:59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gkrellm/src/mail.c 2023-04-17 16:49:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* GKrellM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-| Copyright (C) 1999-2019 Bill Wilson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++| Copyright (C) 1999-2021 Bill Wilson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | Author: Bill Wilson billw@gkrellm.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | Latest versions might be found at: http://gkrellm.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1145,7 +1145,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ snprintf(line, sizeof(line), "%s%s", key, account->password);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_free(challenge);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MD5Init(&ctx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MD5Update(&ctx, line, strlen(line));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MD5Update(&ctx, (unsigned char *)line, strlen(line));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MD5Final(digest, &ctx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < 16; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --color=auto -Naur gkrellm-2.3.11/src/panel.c gkrellm/src/panel.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gkrellm-2.3.11/src/panel.c 2019-07-25 09:49:59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gkrellm/src/panel.c 2023-04-17 16:49:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* GKrellM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-| Copyright (C) 1999-2019 Bill Wilson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++| Copyright (C) 1999-2021 Bill Wilson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | Author: Bill Wilson billw@gkrellm.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | Latest versions might be found at: http://gkrellm.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -657,7 +657,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ y = tx->y_off;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (d->flags & DF_SCROLL_TEXT_DIVERTED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (d->flags & DF_SCROLL_TEXT_CENTER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (d->flags & DF_TEXT_CENTER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (d->flags & DF_SCROLL_TEXT_H_LOOP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -693,6 +693,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (d->flags & DF_TEXT_CENTER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (d->flags & DF_TEXT_USE_MARKUP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pango_layout_set_markup(layout, tx->text, strlen(tx->text));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --color=auto -Naur gkrellm-2.3.11/src/sysdeps/solaris.c gkrellm/src/sysdeps/solaris.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gkrellm-2.3.11/src/sysdeps/solaris.c 2019-07-25 09:50:12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gkrellm/src/sysdeps/solaris.c 2023-04-17 16:49:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,41 +50,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_main_init(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Most of stats (cpu, proc, disk, memory, net and uptime) are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * unavailable if kstat_open() failed. So we just exit in that case.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((kc = kstat_open()) == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- perror("kstat_open");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Most of stats (cpu, proc, disk, memory, net and uptime) are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * unavailable if kstat_open() failed. So we just exit in that case.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((kc = kstat_open()) == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ perror("kstat_open");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * kvm is utilized solely for getting a value for proc.n_forks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * from kernel variable called mpid. Even if kvm_open() fails,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * we proceed without it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL)) != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- kvm_nlist(kd, nl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * kvm is utilized solely for getting a value for proc.n_forks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * from kernel variable called mpid. Even if kvm_open() fails,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * we proceed without it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL)) != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kvm_nlist(kd, nl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * a function called by the following requires sys gid privilege.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * the following function should be performed here just for that reason.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- solaris_list_harddisks();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * a function called by the following requires sys gid privilege.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * the following function should be performed here just for that reason.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ solaris_list_harddisks();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (setgid(getgid()) != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- perror("Failed to drop setgid privilege");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (setgid(getgid()) != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ perror("Failed to drop setgid privilege");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_main_cleanup(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* ===================================================================== */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,11 +112,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ perror("kstat_read");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_cpu_assign_data(ksp->ks_instance,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cs.cpu_sysinfo.cpu[CPU_USER],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cs.cpu_sysinfo.cpu[CPU_WAIT],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cs.cpu_sysinfo.cpu[CPU_KERNEL],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cs.cpu_sysinfo.cpu[CPU_IDLE]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_cpu_assign_data(ksp->ks_instance,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cs.cpu_sysinfo.cpu[CPU_USER],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cs.cpu_sysinfo.cpu[CPU_WAIT],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cs.cpu_sysinfo.cpu[CPU_KERNEL],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cs.cpu_sysinfo.cpu[CPU_IDLE]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,7 +130,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_cpu_init() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern kstat_ctl_t *kc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kstat_t *ksp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gint n_cpus = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gint n_cpus = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(kstat_chain_update(kc) == -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ perror("kstat_chain_update");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,12 +141,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (strcmp(ksp->ks_module, "cpu_stat"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (kstat_read(kc, ksp, NULL) != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_cpu_add_instance(ksp->ks_instance);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ++n_cpus;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_cpu_add_instance(ksp->ks_instance);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ++n_cpus;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_cpu_set_number_of_cpus(n_cpus);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_cpu_set_number_of_cpus(n_cpus);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,7 +167,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double avenrun[LOADAVG_NSTATS], fload = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- guint n_processes = 0, n_forks = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint n_processes = 0, n_forks = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int last_pid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern kstat_ctl_t *kc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kstat_t *ksp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -203,15 +203,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* NOTE: code to get 'n_running' is not implemented (stays untouched).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * but it wouldn't do any harm since nobody seems to refer to it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_proc_assign_data(n_processes, 0, n_forks, fload);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_proc_assign_data(n_processes, 0, n_forks, fload);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_proc_read_users(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct utmp *utmpp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gint n_users;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gint n_users;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ n_users = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setutent();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -219,14 +219,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (utmpp->ut_type == USER_PROCESS && utmpp->ut_name[0] != '\0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ n_users++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_proc_assign_users(n_users);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_proc_assign_users(n_users);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_proc_init(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -270,16 +270,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_disk_name_from_device(gint device_number, gint unit_number,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gint *order)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return NULL; /* Disk data by device not implemented in Solaris */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gint *order)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL; /* Disk data by device not implemented in Solaris */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_disk_order_from_name(const gchar *name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return -1; /* Append as added */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1; /* Append as added */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_disk_read_data(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -296,26 +296,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (list = hard_disk_list; list; list = list->next) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- drive = (probed_harddisk *)list->data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ksp->ks_type != KSTAT_TYPE_IO ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcmp(ksp->ks_class, "disk")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (list = hard_disk_list; list; list = list->next) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ drive = (probed_harddisk *)list->data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(strcmp(drive->name, ksp->ks_name))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (strcmp(drive->name, ksp->ks_name))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- memset((void *)&kios, 0, sizeof(kstat_io_t));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- kstat_read(kc, ksp, &kios);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memset((void *)&kios, 0, sizeof(kstat_io_t));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_disk_assign_data_by_name(drive->name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- kios.nread, kios.nwritten, FALSE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (kstat_read(kc, ksp, &kios) == -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ perror("kstat_read");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_disk_assign_data_by_name(drive->name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kios.nread, kios.nwritten, FALSE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* We don't need to keep searching the list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * for a matching hard drive name if we've reached here */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_disk_init(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Is this needed any longer? */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -477,29 +488,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1; /* EACCESS (unless setgid sys) or suchlike */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Not supported on Solaris 7 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ioctl(fd, DKIOCGMEDIAINFO, &dk) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ioctl(fd, DKIOCREMOVABLE, &dkRemovable) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- close(fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- di_devfs_path_free(phys_path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ioctl(fd, DKIOCREMOVABLE, &dkRemovable) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ close(fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ di_devfs_path_free(phys_path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (dk.dki_media_type == DK_FIXED_DISK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!dkRemovable)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- close(fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- di_devfs_path_free(phys_path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ close(fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ di_devfs_path_free(phys_path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1; /* shouldn't be reached */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -663,7 +668,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tcp.local_port = tp6->tcp6ConnLocalPort;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tcp.remote_port = tp6->tcp6ConnRemPort;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(&tcp.remote_addr6, &tp6->tcp6ConnRemAddress,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sizeof(struct in6_addr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sizeof(struct in6_addr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tcp.family = AF_INET6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tcp_status = (tp6->tcp6ConnState == MIB2_TCP_established);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tcp_status == TCP_ALIVE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -679,9 +684,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_inet_init(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* ===================================================================== */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -699,36 +704,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_net_read_data(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gulong rx, tx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gulong rx, tx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern kstat_ctl_t *kc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kstat_t *ksp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kstat_named_t *knp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (kstat_chain_update(kc) == -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- perror("kstat_chain_update");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (kstat_chain_update(kc) == -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ perror("kstat_chain_update");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!strcmp(ksp->ks_class, "net")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- kstat_read(kc, ksp, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!strcmp(ksp->ks_class, "net") && !strcmp(ksp->ks_name, "link")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kstat_read(kc, ksp, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- knp = kstat_data_lookup(ksp, "rbytes");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (knp == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rx = knp->value.ui32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ knp = kstat_data_lookup(ksp, "rbytes");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (knp == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- knp = kstat_data_lookup(ksp, "obytes");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (knp == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tx = knp->value.ui32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rx = knp->value.ui32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_net_assign_data(ksp->ks_name, rx, tx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ knp = kstat_data_lookup(ksp, "obytes");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (knp == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tx = knp->value.ui32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_net_assign_data(ksp->ks_name, rx, tx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* New way is for above gkrellm_sys_net_read_data() to just assign data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -736,17 +743,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_net_sync(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GList *list;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GList *list;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int numifs, numifreqs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i, sockfd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t bufsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gchar *buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gchar *buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct ifreq ifr, *ifrp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct ifconf ifc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ioctl(sockfd, SIOCGIFNUM, (char *)&numifs) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ perror("SIOCGIFNUM");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -784,29 +791,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ numifreqs = ifc.ifc_len / sizeof(struct ifreq);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < numifreqs; i++, ifrp++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- memset((char *)&ifr, 0, sizeof(ifr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strncpy(ifr.ifr_name, ifrp->ifr_name, sizeof(ifr.ifr_name));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!strncmp(ifr.ifr_name, "lo", 2))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- perror("SIOCGIFFLAGS");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ifr.ifr_flags & IFF_UP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_net_interface_is_up(ifr.ifr_name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memset((char *)&ifr, 0, sizeof(ifr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strncpy(ifr.ifr_name, ifrp->ifr_name, sizeof(ifr.ifr_name));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!strncmp(ifr.ifr_name, "lo", 2))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ perror("SIOCGIFFLAGS");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ifr.ifr_flags & IFF_UP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_net_interface_is_up(ifr.ifr_name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(sockfd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_net_isdn_online(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_net_check_routes(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -815,12 +822,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_net_init(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_net_set_lock_directory("/var/spool/locks");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_net_add_timer_type_ppp("ipdptp0");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_net_add_timer_type_ppp("ppp0");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_net_set_lock_directory("/var/spool/locks");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_net_add_timer_type_ppp("ipdptp0");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_net_add_timer_type_ppp("ppp0");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -838,7 +845,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_mem_read_data() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gulong pagesize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- guint64 total, used = 0, free = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint64 total, used = 0, free = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static gulong pageshift = 0, physpages = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern kstat_ctl_t *kc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kstat_t *ksp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -869,12 +876,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ used = total - free;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_mem_assign_data(total, used, free, 0, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_mem_assign_data(total, used, free, 0, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (swapctl(SC_AINFO, &ai) == -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ perror("swapctl");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- swap_total = ai.ani_max;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- swap_total <<= pageshift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ swap_total = ai.ani_max;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ swap_total <<= pageshift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ swap_used = ai.ani_resv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ swap_used <<= pageshift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -888,16 +895,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_swap_read_data(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* page in/out UNIMPLEMENTED */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_swap_assign_data(swap_total, swap_used, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_swap_assign_data(swap_total, swap_used, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_mem_init(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* ===================================================================== */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -910,16 +917,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_fs_fstab_modified(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct stat s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static time_t fstab_mtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gint modified = FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct stat s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static time_t fstab_mtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gint modified = FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (stat("/etc/fstab", &s) == 0 && s.st_mtime != fstab_mtime)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- modified = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fstab_mtime = s.st_mtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return modified;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (stat("/etc/fstab", &s) == 0 && s.st_mtime != fstab_mtime)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ modified = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fstab_mtime = s.st_mtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return modified;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -933,11 +940,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (getvfsent(fp, &vfsbuf) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!vfsbuf.vfs_fstype || strcmp(vfsbuf.vfs_fstype, "ufs"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_fs_add_to_fstab_list(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vfsbuf.vfs_mountp ? vfsbuf.vfs_mountp : "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vfsbuf.vfs_special ? vfsbuf.vfs_special : "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vfsbuf.vfs_fstype ? vfsbuf.vfs_fstype : "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vfsbuf.vfs_mntopts ? vfsbuf.vfs_mntopts : "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_fs_add_to_fstab_list(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vfsbuf.vfs_mountp ? vfsbuf.vfs_mountp : "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vfsbuf.vfs_special ? vfsbuf.vfs_special : "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vfsbuf.vfs_fstype ? vfsbuf.vfs_fstype : "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vfsbuf.vfs_mntopts ? vfsbuf.vfs_mntopts : "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fclose(fp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -955,10 +962,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (strcmp(mntbuf.mnt_fstype, "ufs") &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcmp(mntbuf.mnt_fstype, "nfs"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_fs_add_to_mounts_list(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mntbuf.mnt_mountp ? mntbuf.mnt_mountp : "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mntbuf.mnt_special ? mntbuf.mnt_special : "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mntbuf.mnt_fstype ? mntbuf.mnt_fstype : "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_fs_add_to_mounts_list(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mntbuf.mnt_mountp ? mntbuf.mnt_mountp : "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mntbuf.mnt_special ? mntbuf.mnt_special : "",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mntbuf.mnt_fstype ? mntbuf.mnt_fstype : "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fclose(fp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -967,12 +974,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_fs_get_fsusage(gpointer fs, gchar *dir){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct statvfs st;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (dir && statvfs(dir, &st) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_fs_assign_fsusage_data(fs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (gint64) st.f_blocks, (gint64) st.f_bavail,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (glong) st.f_bfree, (glong) st.f_bsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (dir && statvfs(dir, &st) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_fs_assign_fsusage_data(fs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (gint64) st.f_blocks, (gint64) st.f_bavail,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (glong) st.f_bfree, (glong) st.f_bsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_fs_assign_fsusage_data(fs, 0, 0, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_fs_assign_fsusage_data(fs, 0, 0, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -981,35 +988,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(CDROMEJECT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gint d;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((d = open(device, O_RDONLY)) >= 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ioctl(d, CDROMEJECT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- close(d);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((d = open(device, O_RDONLY)) >= 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ioctl(d, CDROMEJECT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ close(d);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_fs_init(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_fs_setup_eject(NULL, NULL, eject_solaris_cdrom, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_fs_setup_eject(NULL, NULL, eject_solaris_cdrom, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* ===================================================================== */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Battery monitor interface */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_battery_read_data(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_battery_init()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* ===================================================================== */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Uptime monitor interface */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1018,9 +1024,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_uptime_read_uptime(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return (time_t) 0; /* Will calculate using base_uptime */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (time_t) 0; /* Will calculate using base_uptime */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_uptime_init(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1050,7 +1056,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base_uptime = now - boot;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base_uptime += 30;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gkrellm_uptime_set_base_uptime(base_uptime);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gkrellm_uptime_set_base_uptime(base_uptime);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (base_uptime == (time_t) 0) ? FALSE : TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1063,24 +1069,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_sensors_init(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_sensors_get_temperature(gchar *name, gint id, gint iodev, gint inter, gfloat *t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_sensors_get_fan(gchar *name, gint id, gint iodev, gint inter, gfloat *t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gkrellm_sys_sensors_get_voltage(gchar *name, gint id, gint iodev, gint inter, gfloat *t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/gkrellm/files/patch-master-commits.diff b/sysutils/gkrellm/files/patch-master-commits.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6ad1f216353..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/gkrellm/files/patch-master-commits.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,530 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Changelog b/Changelog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b078036..ee52938 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/Changelog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Changelog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +38,7 @@ GKrellM Changelog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Patch from Gerard Neil: Skip autofs mounts in free disk space polling
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Patch from Gerard Neil: Handle cifs as remote filesystem to use longer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nfs-timeout polling interval
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * Patch from Alexandre Rostovtsev: Explicitely link against gmodule-2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Patch from Alexandre Rostovtsev: Explicitly link against gmodule-2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Add support for GPU-Z sensor information on Windows
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Increase minimum required GLib version to 2.32, some parts of gkrellm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use newer GLib API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -151,7 +151,7 @@ GKrellM Changelog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Use unicode function calls.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Use getaddrinfo() on win32.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Support CoreTemp application for getting cpu temperatures.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Redo sensor-handling to support multipe sensor backends.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Redo sensor-handling to support multiple sensor backends.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Make Proc monitor work and properly count # of logged in users.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Mem monitor displays cache bytes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- System name shows some new windows versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/README b/README
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 84df8ac..b8f59d4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/README
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/README
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -549,7 +549,7 @@ The reasons for this choice are a) efficiency (though it might be possible
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- to open/close /dev/sysmon each time a reading is needed without major
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- performance issue) and b) as of october 2001, there's a bug in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- envsys(4) driver which sometimes causes deadlocks when processes try to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--access simultaneoulsy /dev/sysmon (see NetBSD PR#14368). A (quick and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+access simultaneously /dev/sysmon (see NetBSD PR#14368). A (quick and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dirty) workaround for this is to monopolize the driver :)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Themes.html b/Themes.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9975120..e411ec3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/Themes.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Themes.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -719,7 +719,7 @@ krell parameters, frame rendering, etc are made in the gkrellmrc file.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Setting these values may have a variable effect on different monitors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- because the programmer may use the values to differing degrees. For
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- example, margins may affect a label or some text decal but not affect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--other text decals because the programmer explicitely centers the decal.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+other text decals because the programmer explicitly centers the decal.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <p>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- The possible gkrellmrc lines are listed here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <p>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gkrellmd.1 b/gkrellmd.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 073a665..032e775 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/gkrellmd.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/gkrellmd.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -192,7 +192,7 @@ arguments may be given. If no hosts are specified on the command
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- line or in a gkrellmd.conf file, then all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hosts are allowed to connect. The
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .I hostname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--argument may be a text name or a IPv4 or IPv6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+argument may be a text name or an IPv4 or IPv6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dotted notation. For IPv4, the simple subnet pattern x.y.z.* may be used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Also, if
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .I hostname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/server/mail.c b/server/mail.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 83a8a7b..d7929f9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/server/mail.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/server/mail.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -324,7 +324,7 @@ check_maildir(Mailbox *mbox)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | But, new mail arriving (writing mailbox) sets st_mtime while reading
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | the mailbox (mail program reading) sets st_atime. So the test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | st_atime > st_mtime is testing if mbox has been read since last new mail.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- | Mail readers may restore st_mtime after writting status.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | Mail readers may restore st_mtime after writing status.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | And Netscape mail does status with X-Mozilla-Status: xxxS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | where S is bitwise or of status flags:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | 1: read 2: replied 4: marked 8: deleted
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/server/main.c b/server/main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8851e13..1c1f22e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/server/main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/server/main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1124,18 +1124,28 @@ detach_from_terminal(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* !defined(WIN32) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- drop_privileges(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !defined(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (drop_privs.gid > (uid_t)0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (void) setgroups((size_t)0, (gid_t*)0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (void) setgid(drop_privs.gid);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ r = setgroups((size_t)0, (gid_t*)0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (r != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ r = setgid(drop_privs.gid);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (r != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (drop_privs.uid > (uid_t)0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (void) setuid(drop_privs.uid);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ r = setuid(drop_privs.uid);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (r != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1201,7 +1211,12 @@ gkrellmd_run(gint argc, gchar **argv)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- make_pidfile();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gkrellm_sys_main_init();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- drop_privileges();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (drop_privileges() != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_warning("Failed to drop privileges: %s\n", strerror(errno));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gkrellm_sys_main_cleanup();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _GK.start_time = time(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (_GK.update_HZ < 1 || _GK.update_HZ > 10)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/server/monitor.c b/server/monitor.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3e3eec9..1a7fa45 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/server/monitor.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/server/monitor.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2018,7 +2018,7 @@ init_sensors_monitor(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ======================================================= */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static time_t base_uptime,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- up_seconds;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static gulong up_minutes = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static glong up_minutes = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gkrellm_uptime_set_base_uptime(time_t base)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2029,16 +2029,16 @@ gkrellm_uptime_set_base_uptime(time_t base)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- update_uptime(GkrellmdMonitor *mon, gboolean first_update)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gint prev_up;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ glong prev_up;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (GK.ten_second_tick || up_minutes < 0 || first_update)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prev_up = up_minutes;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- up_seconds = gkrellm_sys_uptime_read_uptime();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (up_seconds > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- up_minutes = (gint) (up_seconds / 60);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ up_minutes = (glong) (up_seconds / 60);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- up_minutes = (gint)(time(0) - _GK.start_time + base_uptime) / 60;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ up_minutes = (glong)(time(0) - _GK.start_time + base_uptime) / 60;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (up_minutes != prev_up)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gkrellmd_need_serve(mon);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2050,7 +2050,7 @@ serve_uptime_data(GkrellmdMonitor *mon, gboolean first_serve)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar buf[128];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gkrellmd_set_serve_name(mon, "uptime");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- snprintf(buf, sizeof(buf), "%lu\n", (gulong) up_minutes);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ snprintf(buf, sizeof(buf), "%ld\n", (glong) (up_minutes >= 0 ? up_minutes : 0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gkrellmd_serve_data(mon, buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/shared/log.c b/shared/log.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 44a429c..6d47993 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/shared/log.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/shared/log.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,7 +92,7 @@ gkrellm_log_file_cleanup()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--gkrellm_log_file_log(GLogLevelFlags log_level, const gchar *message)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+gkrellm_log_file_log(G_GNUC_UNUSED GLogLevelFlags log_level, const gchar *message)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- time_t raw_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *local_time_str;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -160,11 +160,11 @@ gkrellm_log_to_terminal(GLogLevelFlags log_level, const gchar *message)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //! Handler that receives all the log-messages first
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--gkrellm_log_handler(const gchar *log_domain, GLogLevelFlags log_level,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const gchar *message, gpointer user_data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+gkrellm_log_handler(G_GNUC_UNUSED const gchar *log_domain, GLogLevelFlags log_level,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const gchar *message, G_GNUC_UNUSED gpointer user_data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar *localized_message;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gint i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ guint i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GkrellmLogFacility *f;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- localized_message = g_locale_from_utf8(message, -1, NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -206,7 +206,7 @@ gkrellm_log_init()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gkrellm_log_cleanup()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gint i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ guint i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GkrellmLogFacility *f;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!s_log_facility_ptr_array)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -231,7 +231,7 @@ gkrellm_log_register(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GkrellmLogCleanupFunc cleanup)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GkrellmLogFacility *f;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gint i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ guint i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!s_log_facility_ptr_array)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return FALSE; // gkrellm_log_init() not called yet
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -260,7 +260,7 @@ gkrellm_log_register(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gboolean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gkrellm_log_unregister(GkrellmLogFunc log)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gint i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ guint i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GkrellmLogFacility *f;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!s_log_facility_ptr_array)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/battery.c b/src/battery.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bacd3cd..40d4198 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/battery.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/battery.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -382,7 +382,7 @@ estimate_battery_time_left(Battery *bat)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* charging, use exponential: eta =~ 2.5 * time-constant (~=92%) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eta = -2.5 * dt/60 / (log(1 - (gdouble)dp/(gdouble)(p+dp)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- eta = abs((gdouble)p / rate); /* use linear */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ eta = fabs((gdouble)p / rate); /* use linear */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef BAT_ESTIMATE_DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr, "eta = %.2f\t", eta);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/client.c b/src/client.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e644eba..8f9d5f8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/client.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/client.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1787,6 +1787,11 @@ read_server_setup(gint fd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gkrellm_client_mode_disconnect(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (client_input_id != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gdk_input_remove(client_input_id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ client_input_id = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (client_fd >= 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gkrellm_debug(DEBUG_CLIENT, "gkrellm_client_mode_disconnect(); " \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1795,8 +1800,6 @@ gkrellm_client_mode_disconnect(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- client_fd = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- server_alive = FALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gdk_input_remove(client_input_id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- client_input_id = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/fs.c b/src/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 626bc74..5db65b1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -460,7 +460,7 @@ fs_draw_decal_text(FSmon *fs, gint value)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GkrellmDecal *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GkrellmTextstyle ts_save;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar buf[128];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gint x_off, w;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gint x_off, w = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (value == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -810,7 +810,7 @@ fs_update(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fs->blocks > 2147483648LL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs->krell_factor = 1024 * 1024;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (fs->blocks > 2097152LL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fs->krell_factor = 1024 * 1024;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fs->krell_factor = 1024;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs->krell_factor = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/gkrellm-sysdeps.h b/src/gkrellm-sysdeps.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9a0f8fc..07295fb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/gkrellm-sysdeps.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/gkrellm-sysdeps.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,7 +139,7 @@ void gkrellm_proc_assign_users(gint n_users);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | the device numbers to an identifying name. It may also set an order
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | value for the name to control the stacking order of the disk chart.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | If gkrellm_disk_assign_data_by_name() is used, then an order may be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--| optionally specifed with gkrellm_sys_disk_order_from_name().
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+| optionally specified with gkrellm_sys_disk_order_from_name().
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | (the default order of -1 simply appends disk charts as data for them
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | is reported). After this function is called for a disk, the function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | gkrellm_disk_subdisk_assign_data_by_name() may be called for subdisk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/gui.c b/src/gui.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 406f2e9..68a43e6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/gui.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/gui.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1569,7 +1569,7 @@ gkrellm_save_theme_config(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar *path;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Assume gkrellm -t is for testing and don't save theme config changes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- | Similary for _GK.demo.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | Similarly for _GK.demo.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!theme_modified || _GK.command_line_theme || _GK.demo || _GK.no_config)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/krell.c b/src/krell.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 697c4a0..07a1a1d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/krell.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/krell.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -663,7 +663,7 @@ reset_text_layer_pixmap_decal_region(GkrellmPanel *p, GkrellmDecal *d)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | a decal's extents. So when scrolling, a slow Pango redraw at each scroll
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | step can be avoided if the text string has not changed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | There are a couple of limitations because it's impossible to generate a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- | stencil bitmask of Pango rendered text (Pango doesn't allow writting to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | stencil bitmask of Pango rendered text (Pango doesn't allow writing to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | depth 1 and it looks at the background pixmap colors as it renders):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | 1) A scroll text decal is not transparent and will hide any objects
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | underneath it, so when this condition is detected, scroll drawing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/mail.c b/src/mail.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a47cf01..51e53a6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/mail.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/mail.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -814,12 +814,36 @@ tcp_shutdown(ConnInfo *conn, Mailbox *mbox, gchar *message, gboolean warn)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static gboolean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ssl_negotiate(ConnInfo *conn, Mailbox *mbox)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const SSL_METHOD *ssl_method;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const SSL_METHOD *ssl_method = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gchar buf[128];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ssl_method = TLS_client_method();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (_GK.debug_level & DEBUG_MAIL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ format_remote_mbox_name(mbox, buf, sizeof(buf));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_debug("ssl_negotiate( %s ): will use TLS client method\n", buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (mbox->account->use_ssl == SSL_TRANSPORT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ssl_method = SSLv23_client_method();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (_GK.debug_level & DEBUG_MAIL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ format_remote_mbox_name(mbox, buf, sizeof(buf));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_debug("ssl_negotiate( %s ): will use SSLv23 client method\n", buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ssl_method = TLSv1_client_method();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (_GK.debug_level & DEBUG_MAIL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ format_remote_mbox_name(mbox, buf, sizeof(buf));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_debug("ssl_negotiate( %s ): will use TLSv1 client method\n", buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ssl_method == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return tcp_shutdown(conn, mbox,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- N_("Cannot initialize SSL method."),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1251,7 +1275,11 @@ check_imap(Mailbox *mbox)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_SSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (account->use_ssl == SSL_STARTTLS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gkrellm_debug(DEBUG_MAIL, "check_imap: Issuing STARTTLS\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (_GK.debug_level & DEBUG_MAIL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ format_remote_mbox_name(mbox, buf, sizeof(buf));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_debug("check_imap( %s ): issuing STARTTLS\n", buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(line, sizeof(line), "a%03d STARTTLS\r\n", ++seq);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- server_command(&conn, mbox, line);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(line, sizeof(line), "a%03d OK", seq);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1261,7 +1289,11 @@ check_imap(Mailbox *mbox)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TRUE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!ssl_negotiate(&conn, mbox))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return FALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gkrellm_debug(DEBUG_MAIL, "check_imap: STARTTLS successful\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (_GK.debug_level & DEBUG_MAIL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ format_remote_mbox_name(mbox, buf, sizeof(buf));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_debug("check_imap( %s ): STARTTLS successful\n", buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1560,7 +1592,7 @@ check_maildir(Mailbox *mbox)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | But, new mail arriving (writing mailbox) sets st_mtime while reading
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | the mailbox (mail program reading) sets st_atime. So the test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | st_atime > st_mtime is testing if mbox has been read since last new mail.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- | Mail readers may restore st_mtime after writting status.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | Mail readers may restore st_mtime after writing status.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | And Netscape mail does status with X-Mozilla-Status: xxxS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | where S is bitwise or of status flags:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | 1: read 2: replied 4: marked 8: deleted
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/mem.c b/src/mem.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2f85935..c130aa4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/mem.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/mem.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -299,7 +299,7 @@ draw_decal_label(MeminfoMeter *mm, gint draw_to_screen)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GkrellmDecal *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GkrellmTextstyle ts_save;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar buf[128];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gint x_off, w;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gint x_off, w = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = mm->decal_label;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (! mm->label_is_data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/proc.c b/src/proc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a813066..80887b6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/proc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/proc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -347,7 +347,7 @@ setup_proc_scaling(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- res = gkrellm_get_chartconfig_grid_resolution(cp->config);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Since grid_resolution is set for load, set krell_full_scale explicitely
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Since grid_resolution is set for load, set krell_full_scale explicitly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | to get what I want, which is 10 forks full scale.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | When res or number of grids is changed, scale all fork data to keep a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | fixed 50 forks/sec max on the chart.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/sensors.c b/src/sensors.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9482874..80a43e7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/sensors.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/sensors.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1669,7 +1669,7 @@ gkrellm_init_sensor_monitor(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | to composite CPU on a SMP machine.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | 2.1.15 scales sensor factor/offset values by SENSOR_FLOAT_FACTOR to avoid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- | writting decimal points in the config. This is not backwards compatible
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | writing decimal points in the config. This is not backwards compatible
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | with the pre 2.1.15 sensor_config format hence the config file name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | change to sensor-config. But sensor_config is forward compatible
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | since the float factor defaults to 1.0.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/sysdeps/linux.c b/src/sysdeps/linux.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c82dfaf..921cf63 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/sysdeps/linux.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/sysdeps/linux.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -556,6 +556,8 @@ gkrellm_sys_disk_order_from_name(const gchar *name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (i >= table_size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (i > 9) /* > hda */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i += (i - 10) * 16 + suffix - dm->suffix_base;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1523,7 +1525,7 @@ gkrellm_sys_fs_get_mounts_list(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (fgets(buf, sizeof(buf), f))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dev[0] = dir[0] = type[0] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sscanf(buf, "%512s %512s %127s", dev, dir, type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sscanf(buf, "%511s %511s %127s", dev, dir, type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fix_fstab_name(dev);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fix_fstab_name(dir);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fix_fstab_name(type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3155,6 +3157,7 @@ sensors_nvidia_smi_read(gboolean setup)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || !strcmp(id, ":")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ stmp = str;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((str = g_strstr_len(str, -1, "Temperature")) != NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- str += 11;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3183,6 +3186,10 @@ sensors_nvidia_smi_read(gboolean setup)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if ((smi = nvidia_smi_lookup(id)) != NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- smi->temp = temp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ str = stmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (output)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4029,7 +4036,7 @@ gkrellm_sys_sensors_init(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sensors_nvidia_smi_read(TRUE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* nvidia-settings GPU core & ambient temperatues
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* nvidia-settings GPU core & ambient temperatures
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cnt = sensors_nvidia_settings_ngpus();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ngpus_added = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/utils.c b/src/utils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f6162e9..0190ed8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/utils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/utils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -276,13 +276,17 @@ gkrellm_format_size_abbrev(gchar *buf, size_t buflen, gfloat size,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gfloat abs_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gint i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- abs_size = (size < 0.0) ? -size : size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < tbl_size - 1; ++i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (abs_size < tbl[i].limit)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return snprintf(buf, buflen, tbl[i].format, size / tbl[i].divisor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ret = snprintf(buf, buflen, tbl[i].format, size / tbl[i].divisor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ret < 0 || ret >= buflen)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -366,7 +370,8 @@ gkrellm_text_extents(PangoFontDescription *font_desc, gchar *text,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- utf8 = g_locale_to_utf8(text, -1, NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pango_layout_set_text(layout, utf8, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (utf8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pango_layout_set_text(layout, utf8, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_free(utf8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- iter = pango_layout_get_iter(layout);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -456,7 +461,8 @@ gkrellm_gdk_draw_text(GdkDrawable *drawable, PangoFontDescription *font_desc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- layout = gtk_widget_create_pango_layout(gkrellm_get_top_window(), NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pango_layout_set_font_description(layout, font_desc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pango_layout_set_text(layout, string, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (g_utf8_validate(string, -1, NULL))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pango_layout_set_text(layout, string, len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk_draw_layout(drawable, gc, x, y, layout);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_object_unref(layout);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>