Fixed another bug with symlinks

Author: PQCraft

extract-xiso.c

@@ -1724,24 +1724,30 @@ int write_tree( dir_node_avl *in_avl, write_tree_context *in_context, int in_dep
 				context.progress = in_context->progress;
 				context.final_bytes = in_context->final_bytes;
 
-				if ( in_context->from == -1 ) {
-					if ( chdir( in_avl->filename ) == -1 ) chdir_err( in_avl->filename );
-				}
-
-				if ( ! err ) err = avl_traverse_depth_first( in_avl->subdirectory, (traversal_callback) write_file, &context, k_prefix, 0 );
-				if ( ! err ) err = avl_traverse_depth_first( in_avl->subdirectory, (traversal_callback) write_tree, &context, k_prefix, 0 );
-
-				if (!err && lseek(in_context->xiso, (xoff_t)in_avl->start_sector * XISO_SECTOR_SIZE, SEEK_SET) == -1) seek_err();
-				if (!err) err = avl_traverse_depth_first(in_avl->subdirectory, (traversal_callback)write_directory, (void*)(uintptr_t)in_context->xiso, k_prefix, 0);
-				if (!err && (pos = lseek(in_context->xiso, 0, SEEK_CUR)) == -1) seek_err();
-				if (!err && (pad = (int)((XISO_SECTOR_SIZE - (pos % XISO_SECTOR_SIZE)) % XISO_SECTOR_SIZE))) {
-					memset(sector, XISO_PAD_BYTE, pad);
-					if (write(in_context->xiso, sector, pad) != pad) write_err();
-				}
-
-				if ( ! err && in_context->from == -1 ) {
-					if ( chdir( ".." ) == -1 ) chdir_err( ".." );
-				}
+				char* rpwd = realpath( ".", NULL );
+				if ( ! rpwd ) {
+					read_err();
+				} else {
+				    if ( in_context->from == -1 ) {
+					    if ( chdir( in_avl->filename ) == -1 ) chdir_err( in_avl->filename );
+				    }
+
+				    if ( ! err ) err = avl_traverse_depth_first( in_avl->subdirectory, (traversal_callback) write_file, &context, k_prefix, 0 );
+				    if ( ! err ) err = avl_traverse_depth_first( in_avl->subdirectory, (traversal_callback) write_tree, &context, k_prefix, 0 );
+
+				    if (!err && lseek(in_context->xiso, (xoff_t)in_avl->start_sector * XISO_SECTOR_SIZE, SEEK_SET) == -1) seek_err();
+				    if (!err) err = avl_traverse_depth_first(in_avl->subdirectory, (traversal_callback)write_directory, (void*)(uintptr_t)in_context->xiso, k_prefix, 0);
+				    if (!err && (pos = lseek(in_context->xiso, 0, SEEK_CUR)) == -1) seek_err();
+				    if (!err && (pad = (int)((XISO_SECTOR_SIZE - (pos % XISO_SECTOR_SIZE)) % XISO_SECTOR_SIZE))) {
+					    memset(sector, XISO_PAD_BYTE, pad);
+					    if (write(in_context->xiso, sector, pad) != pad) write_err();
+				    }
+
+				    if ( ! err && in_context->from == -1 ) {
+					    if ( chdir( rpwd ) == -1 ) chdir_err( rpwd );
+				    }
+			    }
+			    free(rpwd);
 
 				if ( context.path ) free( context.path );
 			} else {