/*
* Copyright (C) 2012 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2013 - Raphaƫl Beamonte <raphael.beamonte@gmail.com>
*
* 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
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) {
if (*path != '/' && strncmp(path, "./", 2) != 0 &&
strncmp(path, "../", 3) != 0) {
snprintf(absolute_path, PATH_MAX, "./%s", path);
- /* Else, we just copy the path */
+ /* Else, we just copy the path */
} else {
strncpy(absolute_path, path, PATH_MAX);
}
absolute_path, PATH_MAX);
}
+ /* Identify the last token */
+ last_token = strrchr(absolute_path, '/');
+
+ /* Verify that this token is not a relative path */
+ is_dotdot = (strcmp(last_token, "/..") == 0);
+ is_dot = (strcmp(last_token, "/.") == 0);
+
+ /* If it is, take action */
+ if (is_dot || is_dotdot) {
+ /* For both, remove this token */
+ *last_token = '\0';
+
+ /* If it was a reference to parent directory, go back one more time */
+ if (is_dotdot) {
+ last_token = strrchr(absolute_path, '/');
+
+ /* If there was only one level left, we keep the first '/' */
+ if (last_token == absolute_path) {
+ last_token++;
+ }
+
+ *last_token = '\0';
+ }
+ }
+
return absolute_path;
error: