X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcommon.c;h=0069a8b6508691b4fd2270642d10452428606fc4;hb=4ecefb9fb8183eadee48538553615c0425e51f69;hp=142d7979adf1fc2c02e6a54d9a4bdc8483598c4e;hpb=c9827c15fc557d7c9201f925f406023d660478eb;p=collectd.git

diff --git a/src/common.c b/src/common.c
index 142d7979..0069a8b6 100644
--- a/src/common.c
+++ b/src/common.c
@@ -39,11 +39,6 @@
 # include <math.h>
 #endif
 
-/* for ntohl and htonl */
-#if HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-
 /* for getaddrinfo */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -53,6 +48,11 @@
 # include <netinet/in.h>
 #endif
 
+/* for ntohl and htonl */
+#if HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
+
 #ifdef HAVE_LIBKSTAT
 extern kstat_ctl_t *kc;
 #endif
@@ -543,7 +543,8 @@ int check_create_dir (const char *file_orig)
 		}
 
 		while (42) {
-			if (stat (dir, &statbuf) == -1)
+			if ((stat (dir, &statbuf) == -1)
+					&& (lstat (dir, &statbuf) == -1))
 			{
 				if (errno == ENOENT)
 				{
@@ -939,15 +940,15 @@ int parse_identifier_vl (const char *str, value_list_t *vl) /* {{{ */
 	if (status != 0)
 		return (status);
 
-	sstrncpy (vl->host, host, sizeof (host));
-	sstrncpy (vl->plugin, plugin, sizeof (plugin));
+	sstrncpy (vl->host, host, sizeof (vl->host));
+	sstrncpy (vl->plugin, plugin, sizeof (vl->plugin));
 	sstrncpy (vl->plugin_instance,
 			(plugin_instance != NULL) ? plugin_instance : "",
-			sizeof (plugin_instance));
-	sstrncpy (vl->type, type, sizeof (type));
+			sizeof (vl->plugin_instance));
+	sstrncpy (vl->type, type, sizeof (vl->type));
 	sstrncpy (vl->type_instance,
 			(type_instance != NULL) ? type_instance : "",
-			sizeof (type_instance));
+			sizeof (vl->type_instance));
 
 	return (0);
 } /* }}} int parse_identifier_vl */
@@ -980,12 +981,15 @@ int parse_value (const char *value, value_t *ret_value, int ds_type)
   }
 
   if (value == endptr) {
-    ERROR ("parse_value: Failed to parse string as number: %s.", value);
+    ERROR ("parse_value: Failed to parse string as %s: %s.",
+        DS_TYPE_TO_STRING (ds_type), value);
     return -1;
   }
   else if ((NULL != endptr) && ('\0' != *endptr))
-    WARNING ("parse_value: Ignoring trailing garbage after number: %s.",
-        endptr);
+    INFO ("parse_value: Ignoring trailing garbage \"%s\" after %s value. "
+        "Input string was \"%s\".",
+        endptr, DS_TYPE_TO_STRING (ds_type), value);
+
   return 0;
 } /* int parse_value */