X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fdelete_image.c;h=7e33ea3cebbcf59dcc6435ca242f1513583b0541;hb=61e88c80f4b0262be1da706d2dbb05597b265cd1;hp=ecd80478f7cf73d62461c53c5fb00b4294db7f0a;hpb=40beb80283a2df7af88c8359ca41adb814585e9a;p=wimlib

diff --git a/src/delete_image.c b/src/delete_image.c
index ecd80478..7e33ea3c 100644
--- a/src/delete_image.c
+++ b/src/delete_image.c
@@ -3,90 +3,82 @@
  */
 
 /*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
-#include "xml.h"
-#include <string.h>
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
-/*
- * Deletes an image from the WIM.
- */
-WIMLIBAPI int wimlib_delete_image(WIMStruct *w, int image)
+#include "wimlib.h"
+#include "wimlib/error.h"
+#include "wimlib/metadata.h"
+#include "wimlib/util.h"
+#include "wimlib/wim.h"
+#include "wimlib/xml.h"
+
+/* API function documented in wimlib.h  */
+WIMLIBAPI int
+wimlib_delete_image(WIMStruct *wim, int image)
 {
-	int i;
 	int ret;
-
-	if (w->hdr.total_parts != 1) {
-		ERROR("Deleting an image from a split WIM is not supported.");
-		return WIMLIB_ERR_SPLIT_UNSUPPORTED;
-	}
+	int first, last;
 
 	if (image == WIMLIB_ALL_IMAGES) {
-		for (i = w->hdr.image_count; i >= 1; i--) {
-			ret = wimlib_delete_image(w, i);
-			if (ret != 0)
-				return ret;
-		}
-		return 0;
+		last = wim->hdr.image_count;
+		first = 1;
+	} else {
+		last = image;
+		first = image;
 	}
 
-	if (!w->all_images_verified) {
-		ret = wim_run_full_verifications(w);
-		if (ret != 0)
-			return ret;
-	}
-
-	DEBUG("Deleting image %d", image);
+	for (image = last; image >= first; image--) {
+		DEBUG("Deleting image %d", image);
 
-	/* Even if the dentry tree is not allocated, we must select it (and
-	 * therefore allocate it) so that we can decrement the reference counts
-	 * in the lookup table.  */
-	ret = select_wim_image(w, image);
-	if (ret != 0)
-		return ret;
+		/* Even if the dentry tree is not allocated, we must select it
+		 * (and therefore allocate it) so that we can decrement stream
+		 * reference counts.  */
+		ret = select_wim_image(wim, image);
+		if (ret)
+			return ret;
 
-	/* Free the dentry tree, any lookup table entries that have their
-	 * refcnt decremented to 0, and the security data. */
-	destroy_image_metadata(&w->image_metadata[image - 1], w->lookup_table);
+		/* Unless the image metadata is shared by another WIMStruct,
+		 * free the dentry tree, free the security data, and decrement
+		 * stream reference counts.  */
+		put_image_metadata(wim->image_metadata[image - 1], wim->lookup_table);
 
-	/* Get rid of the empty slot in the image metadata array. */
-	memmove(&w->image_metadata[image - 1], &w->image_metadata[image],
-		(w->hdr.image_count - image) * sizeof(struct image_metadata));
+		/* Get rid of the empty slot in the image metadata array. */
+		for (int i = image - 1; i < wim->hdr.image_count - 1; i++)
+			wim->image_metadata[i] = wim->image_metadata[i + 1];
 
-	/* Decrement the image count. */
-	if (--w->hdr.image_count == 0) {
-		FREE(w->image_metadata);
-		w->image_metadata = NULL;
-	}
+		/* Decrement the image count. */
+		--wim->hdr.image_count;
 
-	/* Fix the boot index. */
-	if (w->hdr.boot_idx == image)
-		w->hdr.boot_idx = 0;
-	else if (w->hdr.boot_idx > image)
-		w->hdr.boot_idx--;
+		/* Fix the boot index. */
+		if (wim->hdr.boot_idx == image)
+			wim->hdr.boot_idx = 0;
+		else if (wim->hdr.boot_idx > image)
+			wim->hdr.boot_idx--;
 
-	w->current_image = WIMLIB_NO_IMAGE;
+		wim->current_image = WIMLIB_NO_IMAGE;
 
-	/* Remove the image from the XML information. */
-	xml_delete_image(&w->wim_info, image);
+		/* Remove the image from the XML information. */
+		xml_delete_image(&wim->wim_info, image);
 
-	w->deletion_occurred = true;
+		wim->deletion_occurred = 1;
+	}
 	return 0;
 }