diff options
Diffstat (limited to 'cli/src')
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 16 | ||||
| -rw-r--r-- | cli/src/cli.c | 64 | ||||
| -rw-r--r-- | cli/src/cli.h | 3 |
3 files changed, 8 insertions, 75 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index 6c8d374ebc1..02eb2c36992 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -80,7 +80,7 @@ cli_cmd_bricks_parse (const char **words, int wordcount, int brick_index, goto out; } else { delimiter = strrchr (words[brick_index], ':'); - ret = cli_canonicalize_path (delimiter + 1); + ret = gf_canonicalize_path (delimiter + 1); if (ret) goto out; } @@ -979,7 +979,7 @@ cli_cmd_volume_remove_brick_parse (const char **words, int wordcount, goto out; } else { delimiter = strrchr(words[brick_index], ':'); - ret = cli_canonicalize_path (delimiter + 1); + ret = gf_canonicalize_path (delimiter + 1); if (ret) goto out; } @@ -1073,7 +1073,7 @@ cli_cmd_volume_replace_brick_parse (const char **words, int wordcount, goto out; } else { delimiter = strrchr ((char *)words[3], ':'); - ret = cli_canonicalize_path (delimiter + 1); + ret = gf_canonicalize_path (delimiter + 1); if (ret) goto out; } @@ -1094,7 +1094,7 @@ cli_cmd_volume_replace_brick_parse (const char **words, int wordcount, goto out; } else { delimiter = strrchr ((char *)words[4], ':'); - ret = cli_canonicalize_path (delimiter + 1); + ret = gf_canonicalize_path (delimiter + 1); if (ret) goto out; } @@ -1202,7 +1202,7 @@ cli_cmd_log_filename_parse (const char **words, int wordcount, dict_t **options) ret = -1; goto out; } else { - ret = cli_canonicalize_path (delimiter + 1); + ret = gf_canonicalize_path (delimiter + 1); if (ret) goto out; } @@ -1318,7 +1318,7 @@ cli_cmd_log_locate_parse (const char **words, int wordcount, dict_t **options) ret = -1; goto out; } else { - ret = cli_canonicalize_path (delimiter + 1); + ret = gf_canonicalize_path (delimiter + 1); if (ret) goto out; } @@ -1369,7 +1369,7 @@ cli_cmd_log_rotate_parse (const char **words, int wordcount, dict_t **options) ret = -1; goto out; } else { - ret = cli_canonicalize_path (delimiter + 1); + ret = gf_canonicalize_path (delimiter + 1); if (ret) goto out; } @@ -1758,7 +1758,7 @@ cli_cmd_volume_top_parse (const char **words, int wordcount, ret = -1; goto out; } else { - ret = cli_canonicalize_path (delimiter + 1); + ret = gf_canonicalize_path (delimiter + 1); if (ret) goto out; } diff --git a/cli/src/cli.c b/cli/src/cli.c index 6a5ecf698c9..89b5a8bd40f 100644 --- a/cli/src/cli.c +++ b/cli/src/cli.c @@ -577,70 +577,6 @@ cli_local_wipe (cli_local_t *local) return; } -/* If the path exists use realpath(3) to handle extra slashes and to resolve - * symlinks else strip the extra slashes in the path and return */ - -int -cli_canonicalize_path (char *path) -{ - struct stat sb = {0}; - int ret = -1; - char *tmppath = NULL; - char *dir = NULL; - char *tmpstr = NULL; - int path_len = 0; - - if (!path) - return ret; - - ret = stat (path, &sb); - if (ret == -1) { - /* Strip the extra slashes and return */ - tmppath = gf_strdup (path); - if (tmppath == NULL) { - ret = -1; - gf_log ("cli", GF_LOG_ERROR, "Out of memory."); - goto out; - } - bzero (path, strlen(path)); - path[0] = '/'; - dir = strtok_r(tmppath, "/", &tmpstr); - while (dir) { - strncpy ((path + path_len + 1), dir, strlen(dir)); - path_len = strlen (path); - dir = strtok_r(NULL, "/", &tmpstr); - if (dir) - strncpy((path + path_len), "/", 1); - } - if (path_len == 0) - path[1] = '\0'; - else - path[path_len] = '\0'; - ret = 0; - goto out; - } else { - tmppath = gf_strdup(path); - if (tmppath == NULL) { - ret = -1; - gf_log ("cli", GF_LOG_ERROR, "Out of memory."); - goto out; - } - if (realpath (tmppath, path) == NULL) { - cli_out ("Path manipulation failed: %s", - strerror(errno)); - gf_log ("cli", GF_LOG_ERROR, "Path manipulation " - "failed: %s", strerror(errno)); - ret = -1; - goto out; - } - ret = 0; - } -out: - if (tmppath) - GF_FREE(tmppath); - return ret; -} - struct cli_state *global_state; int diff --git a/cli/src/cli.h b/cli/src/cli.h index 0b769812c5d..76b92e91d47 100644 --- a/cli/src/cli.h +++ b/cli/src/cli.h @@ -262,9 +262,6 @@ int cli_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event, void *data); -int -cli_canonicalize_path (char *path); - int32_t cli_cmd_volume_profile_parse (const char **words, int wordcount, dict_t **options); |