Rewrite git_repository__cleanup_files

This commit is contained in:
Vicent Marti 2014-04-09 12:43:27 +02:00
parent c031129510
commit c3dcbe8488

View File

@ -1955,26 +1955,32 @@ int git_repository_state(git_repository *repo)
return state;
}
int git_repository__cleanup_files(git_repository *repo, const char *files[], size_t files_len)
int git_repository__cleanup_files(
git_repository *repo, const char *files[], size_t files_len)
{
git_buf path = GIT_BUF_INIT;
git_buf buf = GIT_BUF_INIT;
size_t i;
int error = 0;
int error;
for (i = 0; i < files_len; ++i) {
git_buf_clear(&path);
for (error = 0, i = 0; !error && i < files_len; ++i) {
const char *path;
if ((error = git_buf_joinpath(&path, repo->path_repository, files[i])) < 0 ||
(git_path_isfile(git_buf_cstr(&path)) &&
(error = p_unlink(git_buf_cstr(&path))) < 0) ||
(git_path_isdir(git_buf_cstr(&path)) &&
(error = git_futils_rmdir_r(git_buf_cstr(&path), NULL, GIT_RMDIR_REMOVE_FILES | GIT_RMDIR_REMOVE_BLOCKERS)) < 0))
goto done;
if (git_buf_joinpath(&buf, repo->path_repository, files[i]) < 0)
return -1;
path = git_buf_cstr(&buf);
if (git_path_isfile(path)) {
error = p_unlink(path);
} else if (git_path_isdir(path)) {
error = git_futils_rmdir_r(path, NULL,
GIT_RMDIR_REMOVE_FILES | GIT_RMDIR_REMOVE_BLOCKERS);
}
done:
git_buf_free(&path);
git_buf_clear(&buf);
}
git_buf_free(&buf);
return error;
}