X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flibvirt.c;h=5acff29a578cd609dff2ba7de65bab1e13c4fc3b;hb=ec404735b0676bb44fdba10f3760e1ba9632405a;hp=0a998228020203829ea8f56f87a866a4c0a0a08d;hpb=d2914ae1474b2d42120c65c3f48be0be7affcb4e;p=collectd.git

diff --git a/src/libvirt.c b/src/libvirt.c
index 0a998228..5acff29a 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/libvirt.c
- * Copyright (C) 2006,2007  Red Hat Inc.
+ * Copyright (C) 2006-2008  Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -634,7 +634,7 @@ ignore_device_match (ignorelist_t *il, const char *domname, const char *devpath)
         ERROR ("libvirt plugin: malloc failed.");
         return 0;
     }
-    snprintf (name, n, "%s:%s", domname, devpath);
+    ssnprintf (name, n, "%s:%s", domname, devpath);
     r = ignorelist_match (il, name);
     free (name);
     return r;
@@ -643,15 +643,16 @@ ignore_device_match (ignorelist_t *il, const char *domname, const char *devpath)
 static void
 init_value_list (value_list_t *vl, time_t t, virDomainPtr dom)
 {
-    int i;
+    int i, n;
+    const char *name;
+    char uuid[VIR_UUID_STRING_BUFLEN];
     char  *host_ptr;
     size_t host_len;
 
     vl->time = t;
     vl->interval = interval_g;
 
-    strncpy (vl->plugin, "libvirt", sizeof (vl->plugin));
-    vl->plugin[sizeof (vl->plugin) - 1] = '\0';
+    sstrncpy (vl->plugin, "libvirt", sizeof (vl->plugin));
 
     vl->host[0] = '\0';
     host_ptr = vl->host;
@@ -659,51 +660,32 @@ init_value_list (value_list_t *vl, time_t t, virDomainPtr dom)
 
     /* Construct the hostname field according to HostnameFormat. */
     for (i = 0; i < HF_MAX_FIELDS; ++i) {
-	int status = 0;
+        if (hostname_format[i] == hf_none)
+            continue;
+
+        n = DATA_MAX_NAME_LEN - strlen (vl->host) - 2;
+
+        if (i > 0 && n >= 1) {
+            strncat (vl->host, ":", 1);
+            n--;
+        }
 
         switch (hostname_format[i]) {
-	    case hf_none:
-	    	/* do nothing */
-	    	break;
-
-	    case hf_hostname:
-		status = snprintf (host_ptr, host_len, ":%s", hostname_g);
-		break;
-
-	    case hf_name:
-	    {
-		const char *name = virDomainGetName (dom);
-		if (name != NULL)
-		    status = snprintf (host_ptr, host_len, ":%s", name);
-		break;
-	    }
-	    case hf_uuid:
-	    {
-		char uuid[VIR_UUID_STRING_BUFLEN];
-		if (virDomainGetUUIDString (dom, uuid) == 0) {
-		    uuid[sizeof (uuid) - 1] = '\0';
-		    status = snprintf (host_ptr, host_len, ":%s", uuid);
-		}
-		break;
-	    }
-	} /* switch (hostname_format[i]) */
-
-	/* If status >= host_len
-	 * => the buffer is full, there's no null-byte at the end and
-	 *    continuing with this loop doesn't make any sense. */
-	if (status >= host_len) {
-	    host_len = 0;
-	    host_ptr = NULL;
-	}
-	/* else: Test if anything was added to the buffer */
-	else if (status > 0) {
-	    host_len -= status;
-	    host_ptr += status;
-	}
-
-	if (host_len <= 0)
-	    break;
-    } /* for (i) */
+        case hf_none: break;
+        case hf_hostname:
+            strncat (vl->host, hostname_g, n);
+            break;
+        case hf_name:
+            name = virDomainGetName (dom);
+            if (name)
+                strncat (vl->host, name, n);
+            break;
+        case hf_uuid:
+            if (virDomainGetUUIDString (dom, uuid) == 0)
+                strncat (vl->host, uuid, n);
+            break;
+        }
+    }
 
     vl->host[sizeof (vl->host) - 1] = '\0';
 } /* void init_value_list */
@@ -723,7 +705,9 @@ cpu_submit (unsigned long long cpu_time,
     vl.values = values;
     vl.values_len = 1;
 
-    plugin_dispatch_values (type, &vl);
+    sstrncpy (vl.type, type, sizeof (vl.type));
+
+    plugin_dispatch_values (&vl);
 }
 
 static void
@@ -740,10 +724,10 @@ vcpu_submit (counter_t cpu_time,
     vl.values = values;
     vl.values_len = 1;
 
-    snprintf (vl.type_instance, sizeof (vl.type_instance), "%d", vcpu_nr);
-    vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
+    sstrncpy (vl.type, type, sizeof (vl.type));
+    ssnprintf (vl.type_instance, sizeof (vl.type_instance), "%d", vcpu_nr);
 
-    plugin_dispatch_values (type, &vl);
+    plugin_dispatch_values (&vl);
 }
 
 static void
@@ -761,10 +745,10 @@ submit_counter2 (const char *type, counter_t v0, counter_t v1,
     vl.values = values;
     vl.values_len = 2;
 
-    strncpy (vl.type_instance, devname, sizeof (vl.type_instance));
-    vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
+    sstrncpy (vl.type, type, sizeof (vl.type));
+    sstrncpy (vl.type_instance, devname, sizeof (vl.type_instance));
 
-    plugin_dispatch_values (type, &vl);
+    plugin_dispatch_values (&vl);
 } /* void submit_counter2 */
 
 static int