Commit 9dd34b1e by nulltoken Committed by Vicent Marti

Made git_repository_open() and git_repository_init() benefit from recently added…

Made git_repository_open() and git_repository_init() benefit from recently added path prettifying function.
parent ae7ffea9
...@@ -151,19 +151,16 @@ static int guess_repository_DIRs(git_repository *repo, const char *repository_pa ...@@ -151,19 +151,16 @@ static int guess_repository_DIRs(git_repository *repo, const char *repository_pa
{ {
char path_aux[GIT_PATH_MAX], *last_DIR; char path_aux[GIT_PATH_MAX], *last_DIR;
int path_len; int path_len;
int error = GIT_SUCCESS;
if (gitfo_isdir(repository_path) < GIT_SUCCESS) error = git_prettify_dir_path(path_aux, repository_path);
return GIT_ENOTAREPO; if (error < GIT_SUCCESS)
return error;
path_len = strlen(repository_path);
strcpy(path_aux, repository_path);
if (path_aux[path_len - 1] != '/') { if (gitfo_isdir(path_aux) < GIT_SUCCESS)
path_aux[path_len] = '/'; return GIT_ENOTAREPO;
path_aux[path_len + 1] = 0;
path_len = path_len + 1; path_len = strlen(path_aux);
}
repo->path_repository = git__strdup(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) ...@@ -576,17 +573,13 @@ static int repo_init_find_dir(repo_init *results, const char* path)
char temp_path[GIT_PATH_MAX]; char temp_path[GIT_PATH_MAX];
int path_len; int path_len;
int error = GIT_SUCCESS;
path_len = strlen(path); error = git_prettify_dir_path(temp_path, path);
strcpy(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) { if (!results->is_bare) {
strcpy(temp_path + path_len - 1, GIT_DIR); strcpy(temp_path + path_len - 1, GIT_DIR);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment