X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fconf.c;h=55ed6352663e8f71dd2f496bf48cf5696d586bec;hp=6f290b7e5f1df78b34f4d88cf87d500a1c72b1fa;hb=8ab7c0d9aa6d5dd0289a8ebc42b743ff0ac649c6;hpb=d14d33bf091e72b23b1f90ea18a0a01bed098b76 diff --git a/src/bin/lttng/conf.c b/src/bin/lttng/conf.c index 6f290b7e5..55ed63526 100644 --- a/src/bin/lttng/conf.c +++ b/src/bin/lttng/conf.c @@ -25,14 +25,13 @@ #include #include +#include #include "conf.h" /* - * config_get_file_path - * - * Returns the path with '/CONFIG_FILENAME' added to it; - * path will be NULL if an error occurs. + * Returns the path with '/CONFIG_FILENAME' added to it; + * path will be NULL if an error occurs. */ char *config_get_file_path(char *path) { @@ -42,16 +41,15 @@ char *config_get_file_path(char *path) ret = asprintf(&file_path, "%s/%s", path, CONFIG_FILENAME); if (ret < 0) { ERR("Fail allocating config file path"); + file_path = NULL; } return file_path; } /* - * open_config - * - * Returns an open FILE pointer to the config file; - * on error, NULL is returned. + * Returns an open FILE pointer to the config file; + * on error, NULL is returned. */ static FILE *open_config(char *path, const char *mode) { @@ -69,18 +67,14 @@ static FILE *open_config(char *path, const char *mode) } error: - if (file_path) { - free(file_path); - } + free(file_path); return fp; } /* - * create_config_file - * - * Creates the empty config file at the path. - * On success, returns 0; - * on error, returns -1. + * Creates the empty config file at the path. + * On success, returns 0; + * on error, returns -1. */ static int create_config_file(char *path) { @@ -101,11 +95,9 @@ error: } /* - * write_config - * - * Append data to the config file in file_path - * On success, returns 0; - * on error, returns -1. + * Append data to the config file in file_path + * On success, returns 0; + * on error, returns -1. */ static int write_config(char *file_path, size_t size, char *data) { @@ -124,25 +116,15 @@ static int write_config(char *file_path, size_t size, char *data) if (len != 1) { ret = -1; } - fclose(fp); + if (fclose(fp)) { + PERROR("close write_config"); + } end: return ret; } /* - * config_get_default_path - * - * Returns the HOME directory path. Caller MUST NOT free(3) the return pointer. - */ -char *config_get_default_path(void) -{ - return getenv("HOME"); -} - -/* - * config_destroy - * - * Destroys directory config and file config. + * Destroys directory config and file config. */ void config_destroy(char *path) { @@ -154,26 +136,59 @@ 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_read_session_name - * - * Returns the session name from the config file. - * The caller is responsible for freeing the returned string. - * On error, NULL is returned. + * Destroys the default config + */ +void config_destroy_default(void) +{ + char *path = utils_get_home_dir(); + if (path == NULL) { + return; + } + config_destroy(path); +} + +/* + * 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); +} + +/* + * Returns the session name from the config file. + * The caller is responsible for freeing the returned string. + * On error, NULL is returned. */ char *config_read_session_name(char *path) { int ret; FILE *fp; char var[NAME_MAX], *session_name; +#if (NAME_MAX == 255) +#define NAME_MAX_SCANF_IS_A_BROKEN_API "254" +#endif session_name = malloc(NAME_MAX); if (session_name == NULL) { @@ -185,11 +200,14 @@ char *config_read_session_name(char *path) if (fp == NULL) { ERR("Can't find valid lttng config %s/.lttngrc", path); MSG("Did you create a session? (lttng create )"); + free(session_name); goto error; } while (!feof(fp)) { - if ((ret = fscanf(fp, "%[^'=']=%s\n", var, session_name)) != 2) { + if ((ret = fscanf(fp, "%" NAME_MAX_SCANF_IS_A_BROKEN_API + "[^'=']=%" NAME_MAX_SCANF_IS_A_BROKEN_API "s\n", + var, session_name)) != 2) { if (ret == -1) { ERR("Missing session=NAME in config file."); goto error_close; @@ -203,35 +221,42 @@ char *config_read_session_name(char *path) } error_close: - fclose(fp); + free(session_name); + ret = fclose(fp); + if (ret < 0) { + PERROR("close config read session name"); + } error: return NULL; found: - fclose(fp); + ret = fclose(fp); + if (ret < 0) { + PERROR("close config read session name found"); + } return session_name; } /* - * config_add_session_name - * - * Write session name option to the config file. - * On success, returns 0; - * on error, returns -1. + * Write session name option to the config file. + * On success, returns 0; + * on error, returns -1. */ int config_add_session_name(char *path, char *name) { int ret; - char session_name[NAME_MAX]; + char *attr = "session="; + /* Max name len accepted plus attribute's len and the NULL byte. */ + char session_name[NAME_MAX + strlen(attr) + 1]; /* * With GNU C < 2.1, snprintf returns -1 if the target buffer is too small; * With GNU C >= 2.1, snprintf returns the required size (excluding closing null) */ - ret = snprintf(session_name, NAME_MAX, "session=%s\n", name); - if ((ret < 0) || (ret >= NAME_MAX)) { + ret = snprintf(session_name, sizeof(session_name), "%s%s\n", attr, name); + if (ret < 0) { ret = -1; goto error; } @@ -241,18 +266,16 @@ error: } /* - * config_init - * - * Init configuration directory and file. - * On success, returns 0; - * on error, returns -1. + * Init configuration directory and file. + * On success, returns 0; + * on error, returns -1. */ int config_init(char *session_name) { int ret; char *path; - path = config_get_default_path(); + path = utils_get_home_dir(); if (path == NULL) { ret = -1; goto error;