X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwrite.c;h=497158999c807fb0ba6c0d0a8831a70f22f5b082;hb=cbaca94ca219aae5ae32a1f083659e1fa421f676;hp=3866bed6934c80c78a902a7dffddbaa649b2170b;hpb=6f7956a06fcf92a304fae93e393e8eaee34e92d5;p=wimlib

diff --git a/src/write.c b/src/write.c
index 3866bed6..49715899 100644
--- a/src/write.c
+++ b/src/write.c
@@ -12,16 +12,16 @@
  * This file is part of wimlib, a library for working with WIM files.
  *
  * wimlib 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 2.1 of the License, or (at your option)
+ * 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 Lesser General Public License for more
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
@@ -60,6 +60,9 @@ WIMLIBAPI int wimlib_overwrite(WIMStruct *w, int flags)
 	size_t wim_name_len;
 	int ret;
 	
+	if (!w)
+		return WIMLIB_ERR_INVALID_PARAM;
+
 	wimfile_name = w->filename;
 
 	DEBUG("Replacing WIM file `%s'.", wimfile_name);
@@ -247,7 +250,7 @@ static int write_file_resources(WIMStruct *w)
 {
 
 	DEBUG("Writing file resources for image %u.", w->current_image);
-	return for_dentry_in_tree(wim_root_dentry(w), write_file_resource, w);
+	return for_dentry_in_tree(wim_root_dentry(w), write_dentry_resources, w);
 }
 
 /* Write the lookup table, xml data, and integrity table, then overwrite the WIM
@@ -401,10 +404,19 @@ WIMLIBAPI int wimlib_write(WIMStruct *w, const char *path, int image, int flags)
 {
 	int ret;
 
+	if (!w || !path)
+		return WIMLIB_ERR_INVALID_PARAM;
+
 	if (image != WIM_ALL_IMAGES && 
 	     (image < 1 || image > w->hdr.image_count))
 		return WIMLIB_ERR_INVALID_IMAGE;
 
+
+	if (w->hdr.total_parts != 1) {
+		ERROR("Cannot call wimlib_write() on part of a split WIM");
+		return WIMLIB_ERR_SPLIT_UNSUPPORTED;
+	}
+
 	if (image == WIM_ALL_IMAGES)
 		DEBUG("Writing all images to `%s'.", path);
 	else
@@ -416,6 +428,8 @@ WIMLIBAPI int wimlib_write(WIMStruct *w, const char *path, int image, int flags)
 
 	for_lookup_table_entry(w->lookup_table, zero_out_refcnts, NULL);
 
+	w->write_flags = flags;
+
 	ret = for_image(w, image, write_file_resources);
 	if (ret != 0) {
 		ERROR("Failed to write WIM file resources to `%s'", path);