X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcollectd.c;h=915560c0cc80490ba61100b146b1a86b8c42832a;hb=b4c8f3f762d666742c774ab3b45815e5a416e5da;hp=4f5fac901a8445f6992b225d806a456889fae81b;hpb=a04ffbda508739433df0975328100e33e7986c87;p=collectd.git

diff --git a/src/collectd.c b/src/collectd.c
index 4f5fac90..915560c0 100644
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -51,7 +51,9 @@ static int loop = 0;
 static void *do_flush (void __attribute__((unused)) *arg)
 {
 	INFO ("Flushing all data.");
-	plugin_flush (NULL, -1, NULL);
+	plugin_flush (/* plugin = */ NULL,
+			/* timeout = */ 0,
+			/* ident = */ NULL);
 	INFO ("Finished flushing all data.");
 	pthread_exit (NULL);
 	return NULL;
@@ -180,10 +182,11 @@ static int init_global_variables (void)
 
 static int change_basedir (const char *orig_dir)
 {
-	char *dir = strdup (orig_dir);
-	int dirlen;
+	char *dir;
+	size_t dirlen;
 	int status;
 
+	dir = strdup (orig_dir);
 	if (dir == NULL)
 	{
 		char errbuf[1024];
@@ -200,39 +203,41 @@ static int change_basedir (const char *orig_dir)
 		return (-1);
 
 	status = chdir (dir);
-	free (dir);
+	if (status == 0)
+	{
+		free (dir);
+		return (0);
+	}
+	else if (errno != ENOENT)
+	{
+		char errbuf[1024];
+		ERROR ("change_basedir: chdir (%s): %s", dir,
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		free (dir);
+		return (-1);
+	}
 
+	status = mkdir (dir, S_IRWXU | S_IRWXG | S_IRWXO);
 	if (status != 0)
 	{
-		if (errno == ENOENT)
-		{
-			if (mkdir (orig_dir, 0755) == -1)
-			{
-				char errbuf[1024];
-				ERROR ("change_basedir: mkdir (%s): %s", orig_dir,
-						sstrerror (errno, errbuf,
-							sizeof (errbuf)));
-				return (-1);
-			}
-			else if (chdir (orig_dir) == -1)
-			{
-				char errbuf[1024];
-				ERROR ("chdir (%s): %s", orig_dir,
-						sstrerror (errno, errbuf,
-							sizeof (errbuf)));
-				return (-1);
-			}
-		}
-		else
-		{
-			char errbuf[1024];
-			ERROR ("chdir (%s): %s", orig_dir,
-					sstrerror (errno, errbuf,
-						sizeof (errbuf)));
-			return (-1);
-		}
+		char errbuf[1024];
+		ERROR ("change_basedir: mkdir (%s): %s", dir,
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		free (dir);
+		return (-1);
+	}
+
+	status = chdir (dir);
+	if (status != 0)
+	{
+		char errbuf[1024];
+		ERROR ("change_basedir: chdir (%s): %s", dir,
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		free (dir);
+		return (-1);
 	}
 
+	free (dir);
 	return (0);
 } /* static int change_basedir (char *dir) */