X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=40c402953f354b8c6cbd98ffaf0fc25adb4b7c64;hb=084ce6477c1b3f1720b3176e650232b10435e799;hp=57add319ba416b6eda1cb967fc126c008177f45f;hpb=5154230f59b7f66abe33166cf14ef49d2c4e2219;p=lttng-tools.git diff --git a/src/common/utils.c b/src/common/utils.c index 57add319b..40c402953 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 - David Goulet + * Copyright (C) 2013 - Raphaël Beamonte * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License, version 2 only, as @@ -26,7 +27,6 @@ #include #include #include -#include #include #include @@ -164,31 +164,51 @@ error: } /* - * Resolve the './' and '../' strings in the middle of a path using - * our very own way to do it, so that it works even if the directory - * does not exist + * Make a full resolution of the given path even if it doesn't exist. + * This function uses the utils_partial_realpath function to resolve + * symlinks and relatives paths at the start of the string, and + * implements functionnalities to resolve the './' and '../' strings + * in the middle of a path. This function is only necessary because + * realpath(3) does not accept to resolve unexistent paths. + * The returned string was allocated in the function, it is thus of + * the responsibility of the caller to free this memory. */ LTTNG_HIDDEN -char *utils_resolve_relative(const char *path) +char *utils_expand_path(const char *path) { char *next, *previous, *slash, *start_path, *absolute_path = NULL; + char *last_token; + int is_dot, is_dotdot; /* Safety net */ if (path == NULL) { goto error; } - /* Allocate memory for the absolute path */ + /* Allocate memory for the absolute_path */ absolute_path = zmalloc(PATH_MAX); if (absolute_path == NULL) { PERROR("zmalloc expand path"); goto error; } - /* Copy the path in the absolute path */ - strncpy(absolute_path, path, PATH_MAX); + /* + * If the path is not already absolute nor explicitly relative, + * consider we're in the current directory + */ + if (*path != '/' && strncmp(path, "./", 2) != 0 && + strncmp(path, "../", 3) != 0) { + snprintf(absolute_path, PATH_MAX, "./%s", path); + /* Else, we just copy the path */ + } else { + strncpy(absolute_path, path, PATH_MAX); + } + + /* Resolve partially our path */ + absolute_path = utils_partial_realpath(absolute_path, + absolute_path, PATH_MAX); - /* As long as we find '/./' in the path string */ + /* As long as we find '/./' in the working_path string */ while ((next = strstr(absolute_path, "/./"))) { /* We prepare the start_path not containing it */ @@ -200,132 +220,57 @@ char *utils_resolve_relative(const char *path) free(start_path); } - /* As long as we find '/../' in the path string */ + /* As long as we find '/../' in the working_path string */ while ((next = strstr(absolute_path, "/../"))) { - /* If the path starts with '/../', there's a problem */ - if (next == absolute_path) { - ERR("%s: Path cannot be resolved", path); - goto error; - } - /* We find the last level of directory */ previous = absolute_path; - while ((slash = strpbrk(previous + 1, "/")) && slash != next) { - previous = slash; + while ((slash = strpbrk(previous, "/")) && slash != next) { + previous = slash + 1; } /* Then we prepare the start_path not containing it */ start_path = strndup(absolute_path, previous - absolute_path); /* And we concatenate it with the part after the '/../' */ - snprintf(absolute_path, PATH_MAX, "%s%s", start_path, next + 3); + snprintf(absolute_path, PATH_MAX, "%s%s", start_path, next + 4); + /* We can free the memory used for the start path*/ free(start_path); - } - - return absolute_path; - -error: - free(absolute_path); - return NULL; -} - -/* - * Return the realpath(3) of the path even if the last directory token does not - * exist. For example, with /tmp/test1/test2, if test2/ does not exist but the - * /tmp/test1 does, the real path is returned. In normal time, realpath(3) - * fails if the end point directory does not exist. - */ -LTTNG_HIDDEN -char *utils_expand_path(const char *path) -{ - const char *end_path = NULL; - char *next, *cut_path = NULL, *expanded_path = NULL; - - /* Safety net */ - if (path == NULL) { - goto error; + /* Then we verify for symlinks using partial_realpath */ + absolute_path = utils_partial_realpath(absolute_path, + absolute_path, PATH_MAX); } - /* Allocate memory for the expanded path */ - expanded_path = zmalloc(PATH_MAX); - if (expanded_path == NULL) { - PERROR("zmalloc expand path"); - goto error; - } + /* Identify the last token */ + last_token = strrchr(absolute_path, '/'); - /* If given path is already absolute */ - if (*path == '/') { - strncpy(expanded_path, path, PATH_MAX); - /* Else, we have some work to do */ - } else { - /* Pointer to the last char of the path */ - const char *last_char = path + strlen(path) - 1; + /* Verify that this token is not a relative path */ + is_dotdot = (strcmp(last_token, "/..") == 0); + is_dot = (strcmp(last_token, "/.") == 0); - end_path = path; + /* If it is, take action */ + if (is_dot || is_dotdot) { + /* For both, remove this token */ + *last_token = '\0'; - /* Split part that will be resolved by realpath (relative path from - * current directory using ./ or ../ only) and part that could not - * (directory names) - */ - while ((next = strpbrk(end_path, "/")) && (next != last_char)) { - end_path = next + 1; - if (strncmp(end_path, "./", 2) != 0 && - strncmp(end_path, "../", 3) != 0) { - break; - } - } - - /* If this is the end of the string, and we still can resolve it */ - if (strncmp(end_path, "..\0", 3) == 0 || - strncmp(end_path, ".\0", 2) == 0) { - end_path += strlen(end_path); - } - - /* If the end part is the whole path, we are in the current dir */ - if (end_path == path) { - cut_path = strdup("."); - /* Else, cut the resolvable part from original path */ - } else { - cut_path = strndup(path, end_path - path); - } + /* If it was a reference to parent directory, go back one more time */ + if (is_dotdot) { + last_token = strrchr(absolute_path, '/'); - /* Resolve the canonical path of the first part of the path */ - expanded_path = realpath((char *)cut_path, expanded_path); - if (expanded_path == NULL) { - switch (errno) { - case ENOENT: - ERR("%s: No such file or directory", cut_path); - break; - default: - PERROR("realpath utils expand path"); - break; + /* If there was only one level left, we keep the first '/' */ + if (last_token == absolute_path) { + last_token++; } - goto error; - } - /* Add end part to expanded path if not empty */ - if (*end_path != 0) { - strncat(expanded_path, "/", PATH_MAX - strlen(expanded_path) - 1); - strncat(expanded_path, end_path, - PATH_MAX - strlen(expanded_path) - 1); + *last_token = '\0'; } } - /* Resolve the internal './' and '../' strings */ - next = utils_resolve_relative(expanded_path); - if (next == NULL) { - goto error; - } - - free(expanded_path); - free(cut_path); - return next; + return absolute_path; error: - free(expanded_path); - free(cut_path); + free(absolute_path); return NULL; } @@ -702,42 +647,10 @@ error: return ret; } -/** - * Prints the error message corresponding to a regex error code. - * - * @param errcode The error code. - * @param regex The regex object that produced the error code. - */ -static void regex_print_error(int errcode, regex_t *regex) -{ - /* Get length of error message and allocate accordingly */ - size_t length; - char *buffer; - - assert(regex != NULL); - - length = regerror(errcode, regex, NULL, 0); - if (length == 0) { - ERR("regerror returned a length of 0"); - return; - } - - buffer = zmalloc(length); - if (!buffer) { - ERR("regex_print_error: zmalloc failed"); - return; - } - - /* Get and print error message */ - regerror(errcode, regex, buffer, length); - ERR("regex error: %s\n", buffer); - free(buffer); - -} /** * Parse a string that represents a size in human readable format. It - * supports decimal integers suffixed by 'k', 'M' or 'G'. + * supports decimal integers suffixed by 'k', 'K', 'M' or 'G'. * * The suffix multiply the integer by: * 'k': 1024 @@ -745,83 +658,90 @@ static void regex_print_error(int errcode, regex_t *regex) * 'G': 1024^3 * * @param str The string to parse. - * @param size Pointer to a size_t that will be filled with the + * @param size Pointer to a uint64_t that will be filled with the * resulting size. * * @return 0 on success, -1 on failure. */ LTTNG_HIDDEN -int utils_parse_size_suffix(char *str, uint64_t *size) +int utils_parse_size_suffix(const char * const str, uint64_t * const size) { - regex_t regex; int ret; - const int nmatch = 3; - regmatch_t suffix_match, matches[nmatch]; - unsigned long long base_size; + uint64_t base_size; long shift = 0; + const char *str_end; + char *num_end; if (!str) { - return 0; - } - - /* Compile regex */ - ret = regcomp(®ex, "^\\(0x\\)\\{0,1\\}[0-9][0-9]*\\([kKMG]\\{0,1\\}\\)$", 0); - if (ret != 0) { - regex_print_error(ret, ®ex); + DBG("utils_parse_size_suffix: received a NULL string."); ret = -1; goto end; } - /* Match regex */ - ret = regexec(®ex, str, nmatch, matches, 0); - if (ret != 0) { + /* strtoull will accept a negative number, but we don't want to. */ + if (strchr(str, '-') != NULL) { + DBG("utils_parse_size_suffix: invalid size string, should not contain '-'."); ret = -1; - goto free; + goto end; } - /* There is a match ! */ + /* str_end will point to the \0 */ + str_end = str + strlen(str); errno = 0; - base_size = strtoull(str, NULL, 0); + base_size = strtoull(str, &num_end, 0); if (errno != 0) { - PERROR("strtoull"); + PERROR("utils_parse_size_suffix strtoull"); ret = -1; - goto free; - } - - /* Check if there is a suffix */ - suffix_match = matches[2]; - if (suffix_match.rm_eo - suffix_match.rm_so == 1) { - switch (*(str + suffix_match.rm_so)) { - case 'K': - case 'k': - shift = KIBI_LOG2; - break; - case 'M': - shift = MEBI_LOG2; - break; - case 'G': - shift = GIBI_LOG2; - break; - default: - ERR("parse_human_size: invalid suffix"); - ret = -1; - goto free; - } + goto end; + } + + if (num_end == str) { + /* strtoull parsed nothing, not good. */ + DBG("utils_parse_size_suffix: strtoull had nothing good to parse."); + ret = -1; + goto end; + } + + /* Check if a prefix is present. */ + switch (*num_end) { + case 'G': + shift = GIBI_LOG2; + num_end++; + break; + case 'M': /* */ + shift = MEBI_LOG2; + num_end++; + break; + case 'K': + case 'k': + shift = KIBI_LOG2; + num_end++; + break; + case '\0': + break; + default: + DBG("utils_parse_size_suffix: invalid suffix."); + ret = -1; + goto end; + } + + /* Check for garbage after the valid input. */ + if (num_end != str_end) { + DBG("utils_parse_size_suffix: Garbage after size string."); + ret = -1; + goto end; } *size = base_size << shift; /* Check for overflow */ if ((*size >> shift) != base_size) { - ERR("parse_size_suffix: oops, overflow detected."); + DBG("utils_parse_size_suffix: oops, overflow detected."); ret = -1; - goto free; + goto end; } ret = 0; - -free: - regfree(®ex); end: return ret; }