proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 09:09:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3132 from libgit2/cmn/path-direach-cberror

Browse Source 
Provide error messages for git_path_direach operations
This commit is contained in:
Edward Thomson 2015-05-19 14:07:03 -04:00
commit 0aa603363e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fileops.c
View File

@ -703,6 +703,9 @@ static int cp_by_fd(int ifd, int ofd, bool close_fd_when_done)
error = (int)len;
}
if (error < 0)
giterr_set(GITERR_OS, "write error while copying file");
if (close_fd_when_done) {
p_close(ifd);
p_close(ofd);
@ -861,7 +864,8 @@ static int _cp_r_callback(void *ref, git_buf *from)
/* make symlink or regular file */
if (info->flags & GIT_CPDIR_LINK_FILES) {
error = p_link(from->ptr, info->to.ptr);
if ((error = p_link(from->ptr, info->to.ptr)) < 0)
giterr_set(GITERR_OS, "failed to link '%s'", from->ptr);
} else if (S_ISLNK(from_st.st_mode)) {
error = cp_link(from->ptr, info->to.ptr, (size_t)from_st.st_size);
} else {

4
src/path.c
View File

@ -1060,11 +1060,13 @@ int git_path_direach(
if ((error = git_buf_put(path, de_path, de_len)) < 0)
break;
giterr_clear();
error = fn(arg, path);
git_buf_truncate(path, wd_len); /* restore path */
if (error != 0) {
/* Only set our own error if the callback did not set one already */
if (error != 0 && !giterr_last()) {
giterr_set_after_callback(error);
break;
}