X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=3a4f850ba66b22f19d78bdbd9dd52e1257d8ba75;hp=57add319ba416b6eda1cb967fc126c008177f45f;hb=664958450af7685c38cccfc9109d8f5b050e0fd9;hpb=5154230f59b7f66abe33166cf14ef49d2c4e2219 diff --git a/src/common/utils.c b/src/common/utils.c index 57add319b..3a4f850ba 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 @@ -164,12 +165,17 @@ 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; @@ -178,17 +184,30 @@ char *utils_resolve_relative(const char *path) 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,27 +219,26 @@ 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); + + /* Then we verify for symlinks using partial_realpath */ + absolute_path = utils_partial_realpath(absolute_path, + absolute_path, PATH_MAX); } return absolute_path; @@ -230,105 +248,6 @@ error: 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; - } - - /* Allocate memory for the expanded path */ - expanded_path = zmalloc(PATH_MAX); - if (expanded_path == NULL) { - PERROR("zmalloc expand path"); - goto error; - } - - /* 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; - - end_path = path; - - /* 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); - } - - /* 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; - } - 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); - } - } - - /* Resolve the internal './' and '../' strings */ - next = utils_resolve_relative(expanded_path); - if (next == NULL) { - goto error; - } - - free(expanded_path); - free(cut_path); - return next; - -error: - free(expanded_path); - free(cut_path); - return NULL; -} - /* * Create a pipe in dst. */