Check destination path in copy and move

2 files changed, 20 insertions, 3 deletions

diff --git a/src/cmd.c b/src/cmd.c
index af29907..1263e9f 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -62,10 +62,17 @@ cmd_move(const char *name)
 
 	newpath = aprintf("%s/%s", tag->fpath, track->name);
 	OOM_CHECK(newpath);
+
+	if (path_exists(newpath)) {
+		free(newpath);
+		CMD_ERROR("File already exists");
+	}
+
 	if (!dup_file(track->fpath, newpath)) {
 		free(newpath);
 		CMD_ERROR("Failed to move track");
 	}
+
 	free(newpath);
 
 	new = track_add(tag, track->name);
@@ -92,7 +99,7 @@ cmd_copy(const char *name)
 	char *newpath;
 
 	tag = tag_find(name);
-	if (!tag) return 0;
+	if (!tag) CMD_ERROR("Tag not found");
 
 	link = list_at(tracks_vis, track_nav.sel);
 	if (!link) CMD_ERROR("No track selected");
@@ -100,9 +107,15 @@ cmd_copy(const char *name)
 
 	newpath = aprintf("%s/%s", tag->fpath, track->name);
 	OOM_CHECK(newpath);
+
+	if (path_exists(newpath)) {
+		free(newpath);
+		CMD_ERROR("File already exists");
+	}
+
 	if (!dup_file(track->fpath, newpath)) {
 		free(newpath);
-		ERROR("Failed to copy track");
+		CMD_ERROR("Failed to copy track");
 	}
 	free(newpath);
 
@@ -112,7 +125,7 @@ cmd_copy(const char *name)
 		CMD_ERROR("Failed to copy track");
 	}
 
-	return 1;
+	return true;
 }
 
 bool
diff --git a/src/data.c b/src/data.c
index 472d40e..3967df7 100644
--- a/src/data.c
+++ b/src/data.c
@@ -473,6 +473,10 @@ tag_rename(struct tag *tag, const char *name)
 	free(tag->fpath);
 	tag->fpath = newpath;
 
+	free(tag->name);
+	tag->name = strdup(name);
+	OOM_CHECK(tag->name);
+
 	for (LIST_ITER(&tag->tracks, link)) {
 		track = UPCAST(link, struct track, link_tt);
 		free(track->fpath);