Commit Diff

Commit:
ed6b5030fc87f1d187b18f724e18beb2212f6104
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
use got_path_dirname() in merge_blob() instead of assuming const dirname(3) ok naddy
Actions:
Patch | Tree
commit - 3524bbf95aa21318b6fff23c10b26ac57d1ab374
commit + ed6b5030fc87f1d187b18f724e18beb2212f6104
blob - c29ea7cbab4d1f121903653f3697db97180c3307
blob + 6a24cf54d2c45cf985a0dd535b1ffcc55d464de5
--- lib/worktree.c
+++ lib/worktree.c
@@ -1124,13 +1124,13 @@ merge_blob(int *local_changes_subsumed, struct got_wor
 	const struct got_error *err = NULL;
 	FILE *f_deriv = NULL;
 	char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
-	char *label_deriv = NULL, *parent;
+	char *label_deriv = NULL, *parent = NULL;
 
 	*local_changes_subsumed = 0;
 
-	parent = dirname(ondisk_path);
-	if (parent == NULL)
-		return got_error_from_errno2("dirname", ondisk_path);
+	err = got_path_dirname(&parent, ondisk_path);
+	if (err)
+		return err;
 
 	free(base_path);
 	if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
@@ -1169,6 +1169,7 @@ done:
 	}
 	free(id_str);
 	free(label_deriv);
+	free(parent);
 	return err;
 }