DragonFlyBSD support added

diff --git a/Makefile b/Makefile
index af56a199a75b4306d7d04251ecf5a94a04840f2c..eb7da6e81a44840f0c9862858d0b2e4b85fc6327 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,13 @@ LDFLAGS+=-L/usr/local/lib/
 LIBS+=-lossaudio
 endif
 
 LIBS+=-lossaudio
 endif
 

+# This probably applies for any pkgsrc based system
+ifeq ($(shell uname),DragonFly)
+CFLAGS+=-I/usr/pkg/include/
+LDFLAGS+=-L/usr/pkg/lib/
+endif
+
+

 CFLAGS+=$(EXTRA_CFLAGS)
 
 # Fallback for libyajl 1 which did not include yajl_version.h. We need
 CFLAGS+=$(EXTRA_CFLAGS)
 
 # Fallback for libyajl 1 which did not include yajl_version.h. We need

diff --git a/include/i3status.h b/include/i3status.h
index 559df9e2cdd213c44afdc6ae13d74eecff213fff..09394bd1bfade9396da1c87ffd1cd0224a7959eb 100644 (file)
--- a/include/i3status.h
+++ b/include/i3status.h
@@ -18,10 +18,14 @@ enum { O_DZEN2, O_XMOBAR, O_I3BAR, O_NONE } output_format;
 
 #define THERMAL_ZONE "/sys/class/thermal/thermal_zone%d/temp"
 
 
 #define THERMAL_ZONE "/sys/class/thermal/thermal_zone%d/temp"
 

-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)

 
 /* this needs the coretemp module to be loaded */
 
 /* this needs the coretemp module to be loaded */

+#if defined(__DragonFly__)
+#define THERMAL_ZONE "hw.sensors.cpu%d.temp0"
+#else

 #define THERMAL_ZONE "dev.cpu.%d.temperature"
 #define THERMAL_ZONE "dev.cpu.%d.temperature"

+#endif

 #define BATT_LIFE "hw.acpi.battery.life"
 #define BATT_TIME "hw.acpi.battery.time"
 #define BATT_STATE "hw.acpi.battery.state"
 #define BATT_LIFE "hw.acpi.battery.life"
 #define BATT_TIME "hw.acpi.battery.time"
 #define BATT_STATE "hw.acpi.battery.state"

diff --git a/src/print_battery_info.c b/src/print_battery_info.c
index ae113487a61f693544d82764758e62babf769b9f..1545609ea5cdd25b0757a35635d9ebfb7c67c603 100644 (file)
--- a/src/print_battery_info.c
+++ b/src/print_battery_info.c
@@ -9,7 +9,7 @@
 
 #include "i3status.h"
 
 
 #include "i3status.h"
 

-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)

 #include <sys/types.h>
 #include <sys/sysctl.h>
 #endif
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #endif


@@ -186,7 +186,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
                         }
                 }
         }
                         }
                 }
         }

-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)

         int state;
         int sysctl_rslt;
         size_t sysctl_size = sizeof(sysctl_rslt);
         int state;
         int sysctl_rslt;
         size_t sysctl_size = sizeof(sysctl_rslt);

diff --git a/src/print_cpu_temperature.c b/src/print_cpu_temperature.c
index e3340f6e66c1c8f775c11b8ab435ca87855a83ab..96fa4b72ade0a82b2f0b0d0bb73ed24c30d6a79b 100644 (file)
--- a/src/print_cpu_temperature.c
+++ b/src/print_cpu_temperature.c
@@ -8,7 +8,7 @@
 
 #include "i3status.h"
 
 
 #include "i3status.h"
 

-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)

 #include <err.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <err.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>


@@ -72,7 +72,7 @@ void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const
                                 if (colorful_output)
                                         END_COLOR;
                         }
                                 if (colorful_output)
                                         END_COLOR;
                         }

-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)

                         int sysctl_rslt;
                         size_t sysctl_size = sizeof(sysctl_rslt);
                         if (sysctlbyname(path, &sysctl_rslt, &sysctl_size, NULL, 0))
                         int sysctl_rslt;
                         size_t sysctl_size = sizeof(sysctl_rslt);
                         if (sysctlbyname(path, &sysctl_rslt, &sysctl_size, NULL, 0))

diff --git a/src/print_cpu_usage.c b/src/print_cpu_usage.c
index ed17db343d2d5ff857d966a849d048d2b085bb2a..ecc81a2e50c9fcd9a716625ba30d26b94e178514 100644 (file)
--- a/src/print_cpu_usage.c
+++ b/src/print_cpu_usage.c
@@ -13,6 +13,13 @@
 #include <sys/dkstat.h>
 #endif
 
 #include <sys/dkstat.h>
 #endif
 

+#if defined(__DragonFly__)
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/resource.h>
+#endif
+

 #include "i3status.h"
 
 static int prev_total = 0;
 #include "i3status.h"
 
 static int prev_total = 0;


@@ -43,9 +50,9 @@ void print_cpu_usage(yajl_gen json_gen, char *buffer, const char *format) {
         diff_usage = (diff_total ? (1000 * (diff_total - diff_idle)/diff_total + 5)/10 : 0);
         prev_total = curr_total;
         prev_idle  = curr_idle;
         diff_usage = (diff_total ? (1000 * (diff_total - diff_idle)/diff_total + 5)/10 : 0);
         prev_total = curr_total;
         prev_idle  = curr_idle;

-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)

 
 

-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)

         size_t size;
         long cp_time[CPUSTATES];
         size = sizeof cp_time;
         size_t size;
         long cp_time[CPUSTATES];
         size = sizeof cp_time;

diff --git a/src/print_disk_info.c b/src/print_disk_info.c
index b577d233ad56926e46418e0098ebc8c1f69a8be5..f49fe669c9c609ddb181ac7ac32e9bc6b8213c38 100644 (file)
--- a/src/print_disk_info.c
+++ b/src/print_disk_info.c
@@ -6,7 +6,7 @@
 #include <stdint.h>
 #include <sys/statvfs.h>
 #include <sys/types.h>
 #include <stdint.h>
 #include <sys/statvfs.h>
 #include <sys/types.h>

-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || (__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || (__OpenBSD__) || defined(__DragonFly__)

 #include <sys/param.h>
 #include <sys/mount.h>
 #endif
 #include <sys/param.h>
 #include <sys/mount.h>
 #endif


@@ -49,7 +49,7 @@ void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const ch
 
         INSTANCE(path);
 
 
         INSTANCE(path);
 

-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__)

         struct statfs buf;
 
         if (statfs(path, &buf) == -1)
         struct statfs buf;
 
         if (statfs(path, &buf) == -1)

diff --git a/src/print_eth_info.c b/src/print_eth_info.c
index d09873ed8aefbd619624601d1a42815b7a1c0259..8af0dec40d6583602fbfc54524da8eee3d94c577 100644 (file)
--- a/src/print_eth_info.c
+++ b/src/print_eth_info.c
@@ -19,7 +19,7 @@
 #define PART_ETHSPEED  "E: %s (%d Mbit/s)"
 #endif
 
 #define PART_ETHSPEED  "E: %s (%d Mbit/s)"
 #endif
 

-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)

 #include <net/if_media.h>
 #define IFM_TYPE_MATCH(dt, t)                       \
         (IFM_TYPE((dt)) == 0 || IFM_TYPE((dt)) == IFM_TYPE((t)))
 #include <net/if_media.h>
 #define IFM_TYPE_MATCH(dt, t)                       \
         (IFM_TYPE((dt)) == 0 || IFM_TYPE((dt)) == IFM_TYPE((t)))


@@ -47,7 +47,7 @@ static int print_eth_speed(char *outwalk, const char *interface) {
                 ethspeed = (ecmd.speed == USHRT_MAX ? 0 : ecmd.speed);
                 return sprintf(outwalk, "%d Mbit/s", ethspeed);
         } else return sprintf(outwalk, "?");
                 ethspeed = (ecmd.speed == USHRT_MAX ? 0 : ecmd.speed);
                 return sprintf(outwalk, "%d Mbit/s", ethspeed);
         } else return sprintf(outwalk, "?");

-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)

         char *ethspeed;
         struct ifmediareq ifm;
         (void)memset(&ifm, 0, sizeof(ifm));
         char *ethspeed;
         struct ifmediareq ifm;
         (void)memset(&ifm, 0, sizeof(ifm));

diff --git a/src/print_load.c b/src/print_load.c
index 7fd54ca6f1a6f6af7a24649d6f8f750fcf5d9e57..52814729b020985a4fd771aa30c4e6f970f1f5cd 100644 (file)
--- a/src/print_load.c
+++ b/src/print_load.c
@@ -10,7 +10,7 @@ void print_load(yajl_gen json_gen, char *buffer, const char *format) {
         char *outwalk = buffer;
         /* Get load */
 
         char *outwalk = buffer;
         /* Get load */
 

-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(sun)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(sun) || defined(__DragonFly__)

         double loadavg[3];
         const char *walk;
 
         double loadavg[3];
         const char *walk;
 

diff --git a/src/print_volume.c b/src/print_volume.c
index 9c69d081673c5c9a9aedc8755298c11c5a09e292..080dea2a4c01f9312ba8a766c462d5d430ca1983 100644 (file)
--- a/src/print_volume.c
+++ b/src/print_volume.c
@@ -11,7 +11,7 @@
 #include <alloca.h>
 #endif
 
 #include <alloca.h>
 #endif
 

-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)

 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/soundcard.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/soundcard.h>


@@ -174,7 +174,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
                }
        }
 #endif
                }
        }
 #endif

-#if defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)

         char mixerpath[] = "/dev/mixer";
         int mixfd, vol, devmask = 0;
 
         char mixerpath[] = "/dev/mixer";
         int mixfd, vol, devmask = 0;
 

diff --git a/src/print_wireless_info.c b/src/print_wireless_info.c
index 1eddd968f49e63776125ead27d2617e97bbf7df5..9ab9c2f38786f8132d448f69ba7b3f4cb96155d2 100644 (file)
--- a/src/print_wireless_info.c
+++ b/src/print_wireless_info.c
@@ -25,6 +25,19 @@
 #define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN
 #endif
 
 #define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN
 #endif
 

+#ifdef __DragonFly__
+#include <sys/param.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <ifaddrs.h>
+#include <net/if.h>
+#include <net/if_media.h>
+#include <netproto/802_11/ieee80211.h>
+#include <netproto/802_11/ieee80211_ioctl.h>
+#include <unistd.h>
+#define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN
+#endif
+

 #ifdef __OpenBSD__
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #ifdef __OpenBSD__
 #include <sys/ioctl.h>
 #include <sys/socket.h>


@@ -170,7 +183,7 @@ static int get_wireless_info(const char *interface, wireless_info_t *info) {
         close(skfd);
         return 1;
 #endif
         close(skfd);
         return 1;
 #endif

-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)

         int s, len, inwid;
         uint8_t buf[24 * 1024], *cp;
         struct ieee80211req na;
         int s, len, inwid;
         uint8_t buf[24 * 1024], *cp;
         struct ieee80211req na;