1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
$NetBSD: patch-src_conky.c,v 1.1.1.1 2012/05/13 08:42:20 imil Exp $
Enable NetBSD as a suitable platform.
--- src/conky.c.orig 2012-05-03 21:22:21.000000000 +0000
+++ src/conky.c
@@ -65,7 +65,7 @@
#include <fcntl.h>
#include <getopt.h>
#ifdef NCURSES
-#include <ncurses.h>
+#include <curses.h>
#endif
#ifdef XOAP
#include <libxml/parser.h>
@@ -117,15 +117,18 @@
#include "freebsd.h"
#elif defined(__OpenBSD__)
#include "openbsd.h"
+#elif defined(__NetBSD__)
+#include "netbsd.h"
#endif
+
#if defined(__FreeBSD_kernel__)
#include <bsd/bsd.h>
#endif
/* FIXME: apm_getinfo is unused here. maybe it's meant for common.c */
#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
- || defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
+ || defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
int apm_getinfo(int fd, apm_info_t aip);
char *get_apm_adapter(void);
char *get_apm_battery_life(void);
@@ -784,7 +787,7 @@ void generate_text_internal(char *p, int
OBJ(read_tcp) {
print_read_tcp(obj, p, p_max_size);
}
-#ifndef __OpenBSD__
+#if !defined(__OpenBSD__)
OBJ(acpitemp) {
temp_print(p, p_max_size, get_acpi_temperature(obj->data.i), TEMP_CELSIUS);
}
@@ -799,7 +802,7 @@ void generate_text_internal(char *p, int
OBJ(freq_g) {
static int ok = 1;
if (ok) {
-#ifndef __OpenBSD__
+#if !defined(__OpenBSD__) && !defined(__NetBSD__)
ok = get_freq(p, p_max_size, "%'.2f", 1000,
obj->data.i);
#else
@@ -846,7 +849,7 @@ void generate_text_internal(char *p, int
#endif /* __linux__ */
-#ifndef __OpenBSD__
+#if !defined(__OpenBSD__)
OBJ(acpifan) {
get_acpi_fan(p, p_max_size);
}
@@ -1015,13 +1018,11 @@ void generate_text_internal(char *p, int
get_powerbook_batt_info(p, p_max_size, obj->data.i);
}
#endif /* __linux__ */
-#if (defined(__FreeBSD__) || defined(__linux__))
OBJ(if_up) {
if (!interface_up(obj)) {
DO_JUMP;
}
}
-#endif
#ifdef __OpenBSD__
OBJ(obsd_sensors_temp) {
print_obsd_sensors_temp(obj, p, p_max_size);
@@ -1899,7 +1900,7 @@ void generate_text_internal(char *p, int
}
#endif /* __linux__ */
#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
- || defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
+ || defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
OBJ(apm_adapter) {
char *msg;
@@ -5680,6 +5681,13 @@ void initialisation(int argc, char **arg
}
pthread_mutex_init(&kvm_proc_mutex, NULL);
#endif
+#if defined(__NetBSD__)
+ if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, NULL)) == NULL)
+ CRIT_ERR(NULL, NULL, "cannot read kvm");
+
+ /* open the sysmon fd */
+ sysmon_open();
+#endif
while (1) {
int c = getopt_long(argc, argv, getopt_string, longopts, NULL);
@@ -5960,9 +5968,13 @@ int main(int argc, char **argv)
curl_global_cleanup();
#endif
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
kvm_close(kd);
+#ifndef __NetBSD__
pthread_mutex_destroy(&kvm_proc_mutex);
+#else
+ sysmon_close();
+#endif
#endif
return 0;
|
