Commit Diff

Commit:
fddefe3be51f4f87aeffcb5b9c666a5b77672e5b
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
use got_path_dirname() in remove_ondisk_file(); avoids const dirname(3) ok naddy
Actions:
Patch | Tree
commit - f5375317cb16274ce182ea5d99dd913de9b07390
commit + fddefe3be51f4f87aeffcb5b9c666a5b77672e5b
blob - 5e02cc896498a9bc9907b659504cdbe4c41535f2
blob + 6d6bd856f5bf1d81567e3b45f87e256496778093
--- lib/worktree.c
+++ lib/worktree.c
@@ -2047,16 +2047,22 @@ remove_ondisk_file(const char *root_path, const char *
 		if (errno != ENOENT)
 			err = got_error_from_errno2("unlink", ondisk_path);
 	} else {
-		char *parent = dirname(ondisk_path);
-		while (parent && strcmp(parent, root_path) != 0) {
-			if (rmdir(parent) == -1) {
+		size_t root_len = strlen(root_path);
+		do {
+			char *parent;
+			err = got_path_dirname(&parent, ondisk_path);
+			if (err)
+				return err;
+			free(ondisk_path);
+			ondisk_path = parent;
+			if (rmdir(ondisk_path) == -1) {
 				if (errno != ENOTEMPTY)
 					err = got_error_from_errno2("rmdir",
-					    parent);
+					    ondisk_path);
 				break;
 			}
-			parent = dirname(parent);
-		}
+		} while (got_path_cmp(ondisk_path, root_path,
+		    strlen(ondisk_path), root_len) != 0);
 	}
 	free(ondisk_path);
 	return err;