X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fconf.c;h=364977492d05b18002092e549b95d9cc90e2572e;hp=50af2289d11f0d83fd636cb136e504b3887c9be3;hb=87597c2c3bbaa1502ad2025cbf16704829f3b464;hpb=d6a07e7da56c327a0c22c9113a0a9fa7bf8197c6 diff --git a/src/bin/lttng/conf.c b/src/bin/lttng/conf.c index 50af2289d..364977492 100644 --- a/src/bin/lttng/conf.c +++ b/src/bin/lttng/conf.c @@ -15,7 +15,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -23,16 +23,16 @@ #include #include #include +#include -#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 +42,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 +68,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 +96,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 +117,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) { @@ -161,21 +144,18 @@ void config_destroy(char *path) DBG("Removing %s\n", config_path); ret = remove(config_path); if (ret < 0) { - perror("remove config file"); + PERROR("remove config file"); } end: free(config_path); } /* - * config_destroy_default - * - * Destroys the default config + * Destroys the default config */ - void config_destroy_default(void) { - char *path = config_get_default_path(); + char *path = utils_get_home_dir(); if (path == NULL) { return; } @@ -183,9 +163,7 @@ void config_destroy_default(void) } /* - * config_exists - * - * Returns 1 if config exists, 0 otherwise + * Returns 1 if config exists, 0 otherwise */ int config_exists(const char *path) { @@ -199,34 +177,33 @@ int config_exists(const char *path) return S_ISREG(info.st_mode) || S_ISDIR(info.st_mode); } -/* - * 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. - */ -char *config_read_session_name(char *path) +static +int _config_read_session_name(char *path, char **name) { - int ret; + int ret = 0; 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); + session_name = zmalloc(NAME_MAX); if (session_name == NULL) { + ret = -ENOMEM; ERR("Out of memory"); goto error; } fp = open_config(path, "r"); if (fp == NULL) { - ERR("Can't find valid lttng config %s/.lttngrc", path); - MSG("Did you create a session? (lttng create )"); + ret = -ENOENT; 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; @@ -240,35 +217,74 @@ char *config_read_session_name(char *path) } error_close: - fclose(fp); - + if (fclose(fp) < 0) { + PERROR("close config read session name"); + } error: - return NULL; - + free(session_name); + return ret; found: - fclose(fp); - return session_name; + *name = session_name; + if (fclose(fp) < 0) { + PERROR("close config read session name found"); + } + return ret; +} + +/* + * 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; + char *name = NULL; + ret = _config_read_session_name(path, &name); + if (ret == -ENOENT) { + const char *home_dir = utils_get_home_dir(); + + ERR("Can't find valid lttng config %s/.lttngrc", home_dir); + MSG("Did you create a session? (lttng create )"); + } + + return name; } /* - * config_add_session_name + * Returns the session name from the config file. (no warnings/errors emitted) * - * Write session name option to the config file. - * On success, returns 0; - * on error, returns -1. + * The caller is responsible for freeing the returned string. + * On error, NULL is returned. + */ +char *config_read_session_name_quiet(char *path) +{ + char *name = NULL; + + (void) _config_read_session_name(path, &name); + return name; +} + +/* + * 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; } @@ -278,18 +294,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;