From: Francis Giraldeau <francis.giraldeau@gmail.com>
Date: Wed, 30 May 2012 23:50:04 +0000 (+0200)
Subject: Improve delete of configuration
X-Git-Tag: v2.1.0-rc1~126
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=d6a07e7da56c327a0c22c9113a0a9fa7bf8197c6;p=lttng-tools.git

Improve delete of configuration

Adding functions to encapsulate the configuration delete. Test if path to
configuration exists before attempting to remove it.

* fixed braces and goto name

Signed-off-by: Francis Giraldeau <francis.giraldeau@gmail.com>
---

diff --git a/src/bin/lttng/conf.c b/src/bin/lttng/conf.c
index 6f290b7e5..50af2289d 100644
--- a/src/bin/lttng/conf.c
+++ b/src/bin/lttng/conf.c
@@ -154,14 +154,51 @@ void config_destroy(char *path)
 		return;
 	}
 
+	if (!config_exists(config_path)) {
+		goto end;
+	}
+
+	DBG("Removing %s\n", config_path);
 	ret = remove(config_path);
 	if (ret < 0) {
 		perror("remove config file");
 	}
-
+end:
 	free(config_path);
 }
 
+/*
+ *  config_destroy_default
+ *
+ *  Destroys the default config
+ */
+
+void config_destroy_default(void)
+{
+	char *path = config_get_default_path();
+	if (path == NULL) {
+		return;
+	}
+	config_destroy(path);
+}
+
+/*
+ *  config_exists
+ *
+ *  Returns 1 if config exists, 0 otherwise
+ */
+int config_exists(const char *path)
+{
+	int ret;
+	struct stat info;
+
+	ret = stat(path, &info);
+	if (ret < 0) {
+		return 0;
+	}
+	return S_ISREG(info.st_mode) || S_ISDIR(info.st_mode);
+}
+
 /*
  *  config_read_session_name
  *
diff --git a/src/bin/lttng/conf.h b/src/bin/lttng/conf.h
index 1c471dae3..2cb04b0c7 100644
--- a/src/bin/lttng/conf.h
+++ b/src/bin/lttng/conf.h
@@ -21,6 +21,8 @@
 #define CONFIG_FILENAME ".lttngrc"
 
 void config_destroy(char *path);
+void config_destroy_default(void);
+int config_exists(const char *path);
 int config_init(char *path);
 int config_add_session_name(char *path, char *name);
 char *config_get_default_path(void);