Use "old" and "new" prefix when extracting files in sqfsdiff

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

1 files changed, 6 insertions, 7 deletions

diff --git a/difftool/extract.c b/difftool/extract.c
index cefba62..9fec818 100644
--- a/difftool/extract.c
+++ b/difftool/extract.c
@@ -7,14 +7,13 @@
 #include "sqfsdiff.h"
 
 static int extract(data_reader_t *data, file_info_t *fi,
-		   const char *path, char prefix)
+		   const char *prefix, const char *path)
 {
-	char *ptr, *temp = alloca(strlen(path) + 3);
+	char *ptr, *temp;
 	int fd;
 
-	temp[0] = prefix;
-	temp[1] = '/';
-	strcpy(temp + 2, path);
+	temp = alloca(strlen(prefix) + strlen(path) + 2);
+	sprintf(temp, "%s/%s", prefix, path);
 
 	ptr = strrchr(temp, '/');
 	*ptr = '\0';
@@ -41,12 +40,12 @@ int extract_files(sqfsdiff_t *sd, file_info_t *old, file_info_t *new,
 		  const char *path)
 {
 	if (old != NULL && !sd->old_is_dir) {
-		if (extract(sd->sqfs_old.data, old, path, 'a'))
+		if (extract(sd->sqfs_old.data, old, "old", path))
 			return -1;
 	}
 
 	if (new != NULL && !sd->new_is_dir) {
-		if (extract(sd->sqfs_new.data, new, path, 'b'))
+		if (extract(sd->sqfs_new.data, new, "new", path))
 			return -1;
 	}
 	return 0;