*/
/*
- * Copyright (C) 2012, 2013 Eric Biggers
+ * Copyright (C) 2012, 2013, 2014 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"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <string.h>
-/*
- * Deletes an image from the WIM.
- */
-WIMLIBAPI int
-wimlib_delete_image(WIMStruct *w, int image)
+#include "wimlib.h"
+#include "wimlib/metadata.h"
+#include "wimlib/wim.h"
+#include "wimlib/xml.h"
+
+/* Internal method for single-image deletion. This doesn't set the
+ * image_deletion_occurred' flag on the WIMStruct. */
+int
+delete_wim_image(WIMStruct *wim, int image)
{
int ret;
- int first, last;
- if (w->hdr.total_parts != 1) {
- ERROR("Deleting an image from a split WIM is not supported.");
- return WIMLIB_ERR_SPLIT_UNSUPPORTED;
- }
+ /* Load the metadata for the image to be deleted. This is necessary
+ * because blobs referenced by files in the image need to have their
+ * reference counts decremented. */
+ ret = select_wim_image(wim, image);
+ if (ret)
+ return ret;
- if (!w->all_images_verified) {
- ret = wim_run_full_verifications(w);
- if (ret)
- return ret;
- }
+ /* Release the reference to the image metadata and decrement reference
+ * counts on the blobs referenced by files in the image. */
+ put_image_metadata(wim->image_metadata[image - 1], wim->blob_table);
+
+ /* Remove the empty slot from the image metadata array. */
+ memmove(&wim->image_metadata[image - 1], &wim->image_metadata[image],
+ (wim->hdr.image_count - image) *
+ sizeof(wim->image_metadata[0]));
+
+ /* Decrement the image count. */
+ --wim->hdr.image_count;
+
+ /* Remove the image from the XML information. */
+ xml_delete_image(wim->xml_info, image);
+
+ /* 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--;
+
+ /* The image is no longer valid. */
+ wim->current_image = WIMLIB_NO_IMAGE;
+ return 0;
+}
+
+/* API function documented in wimlib.h */
+WIMLIBAPI int
+wimlib_delete_image(WIMStruct *wim, int image)
+{
+ int ret;
+ int first, last;
if (image == WIMLIB_ALL_IMAGES) {
- last = w->hdr.image_count;
+ /* Deleting all images */
+ last = wim->hdr.image_count;
first = 1;
} else {
+ /* Deleting one image */
last = image;
first = 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);
+ ret = delete_wim_image(wim, image);
if (ret)
return ret;
-
- /* Unless the image metadata is shared by another WIMStruct, free the
- * dentry tree, any lookup table entries that have their refcnt
- * decremented to 0, and the security data. */
- put_image_metadata(w->image_metadata[image - 1], w->lookup_table);
-
- /* Get rid of the empty slot in the image metadata array. */
- for (int i = image - 1; i < w->hdr.image_count - 1; i++)
- w->image_metadata[i] = w->image_metadata[i + 1];
-
- /* Decrement the image count. */
- --w->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--;
-
- w->current_image = WIMLIB_NO_IMAGE;
-
- /* Remove the image from the XML information. */
- xml_delete_image(&w->wim_info, image);
-
- w->deletion_occurred = 1;
+ wim->image_deletion_occurred = 1;
}
return 0;
}
git://wimlib.net / wimlib / blobdiff