X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fnut.c;h=695d93b5aa574a7f1c3469f8272e14983d29789c;hb=a019b6c8144745db63c599680bd693ac02f11666;hp=bde5d820168ed97da000993290ee4c4281e50530;hpb=6d3dc246eb6ce32214825f909541cf7cbd441948;p=collectd.git

diff --git a/src/nut.c b/src/nut.c
index bde5d820..695d93b5 100644
--- a/src/nut.c
+++ b/src/nut.c
@@ -23,19 +23,22 @@
 #include "common.h"
 #include "plugin.h"
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
-
-#if HAVE_UPSCLIENT_H
-# include <upsclient.h>
+#include <pthread.h>
+#include <upsclient.h>
+
+#if HAVE_UPSCONN_T
+typedef UPSCONN_t collectd_upsconn_t;
+#elif HAVE_UPSCONN
+typedef UPSCONN collectd_upsconn_t;
+#else
+# error "Unable to determine the UPS connection type."
 #endif
 
 struct nut_ups_s;
 typedef struct nut_ups_s nut_ups_t;
 struct nut_ups_s
 {
-  UPSCONN   *conn;
+  collectd_upsconn_t *conn;
   char      *upsname;
   char      *hostname;
   int        port;
@@ -126,7 +129,7 @@ static void nut_submit (nut_ups_t *ups, const char *type,
       ? hostname_g
       : ups->hostname,
       sizeof (vl.host));
-  strcpy (vl.plugin, "nut");
+  sstrncpy (vl.plugin, "nut", sizeof (vl.plugin));
   strncpy (vl.plugin_instance, ups->upsname, sizeof (vl.plugin_instance));
   strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
@@ -148,7 +151,7 @@ static int nut_read_one (nut_ups_t *ups)
   /* (Re-)Connect if we have no connection */
   if (ups->conn == NULL)
   {
-    ups->conn = (UPSCONN *) malloc (sizeof (UPSCONN));
+    ups->conn = (collectd_upsconn_t *) malloc (sizeof (collectd_upsconn_t));
     if (ups->conn == NULL)
     {
       ERROR ("nut plugin: malloc failed.");