Commit 1233e6b6715afa716b042fc369d0becc3bb9f58f

Stefan Sperling 2020-10-19T23:14:59

switch to got_path_basename in revert_file ok millert

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/lib/worktree.c b/lib/worktree.c
index 1c36cc6..e8828ca 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -4410,13 +4410,12 @@ revert_file(void *arg, unsigned char status, unsigned char staged_status,
 		if (err)
 			goto done;
 
-		te_name = basename(ie->path);
-		if (te_name == NULL) {
-			err = got_error_from_errno2("basename", ie->path);
+		err = got_path_basename(&te_name, ie->path);
+		if (err)
 			goto done;
-		}
 
 		te = got_object_tree_find_entry(tree, te_name);
+		free(te_name);
 		if (te == NULL && status != GOT_STATUS_ADD &&
 		    staged_status != GOT_STATUS_ADD) {
 			err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);