fiasco: after fiasco_unpack return back to origin directory

1 files changed, 24 insertions, 3 deletions

diff --git a/src/fiasco2.c b/src/fiasco2.c
index b155ec4..4b743dd 100644
--- a/src/fiasco2.c
+++ b/src/fiasco2.c
@@ -473,11 +473,23 @@ int fiasco_unpack(struct fiasco * fiasco, const char * dir) {
 	struct image * image;
 	struct image_list * image_list;
 	uint32_t size;
+	char cwd[256];
 	unsigned char buf[4096];
 
-	if ( dir && chdir(dir) < 0 ) {
-		perror("Cannot chdir");
-		return -1;
+	if ( dir ) {
+
+		memset(cwd, 0, sizeof(cwd));
+
+		if ( ! getcwd(cwd, sizeof(cwd)) ) {
+			perror("Cannot getcwd");
+			return -1;
+		}
+
+		if ( chdir(dir) < 0 ) {
+			perror("Cannot chdir");
+			return -1;
+		}
+
 	}
 
 	image_list = fiasco->first;
@@ -556,6 +568,15 @@ int fiasco_unpack(struct fiasco * fiasco, const char * dir) {
 
 	}
 
+	if ( dir ) {
+
+		if ( chdir(cwd) < 0 ) {
+			perror("Cannot chdir");
+			return -1;
+		}
+
+	}
+
 	return 0;
 
 }