From 9dd34b1e89f9d52397dacba1575e3b25cfd6e52e Mon Sep 17 00:00:00 2001 From: nulltoken Date: Fri, 21 Jan 2011 14:02:22 +0100 Subject: [PATCH] Made git_repository_open() and git_repository_init() benefit from recently added path prettifying function. --- src/repository.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/src/repository.c b/src/repository.c index 97a7e15e2..5085d4f5d 100644 --- a/src/repository.c +++ b/src/repository.c @@ -151,19 +151,16 @@ static int guess_repository_DIRs(git_repository *repo, const char *repository_pa { char path_aux[GIT_PATH_MAX], *last_DIR; int path_len; + int error = GIT_SUCCESS; - if (gitfo_isdir(repository_path) < GIT_SUCCESS) + error = git_prettify_dir_path(path_aux, repository_path); + if (error < GIT_SUCCESS) + return error; + + if (gitfo_isdir(path_aux) < GIT_SUCCESS) return GIT_ENOTAREPO; - path_len = strlen(repository_path); - strcpy(path_aux, repository_path); - - if (path_aux[path_len - 1] != '/') { - path_aux[path_len] = '/'; - path_aux[path_len + 1] = 0; - - path_len = path_len + 1; - } + path_len = strlen(path_aux); repo->path_repository = git__strdup(path_aux); @@ -576,17 +573,13 @@ static int repo_init_find_dir(repo_init *results, const char* path) char temp_path[GIT_PATH_MAX]; int path_len; + int error = GIT_SUCCESS; - path_len = strlen(path); - strcpy(temp_path, path); + error = git_prettify_dir_path(temp_path, path); + if (error < GIT_SUCCESS) + return error; - /* Ensure path has a trailing slash */ - if (temp_path[path_len - 1] != '/') { - temp_path[path_len] = '/'; - temp_path[path_len + 1] = 0; - - path_len = path_len + 1; - } + path_len = strlen(temp_path); if (!results->is_bare) { strcpy(temp_path + path_len - 1, GIT_DIR);