X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fxml.c;h=cd335e07d65fa4a72a09223699484b382c7aa8ce;hb=67b6e421c8018a894f38eee258dbc03510137254;hp=ca4814f044d07f2b5c118ad49cd8428069e2a9db;hpb=e08e0d6d920e1f3f154270efc4849d51efd65593;p=wimlib

diff --git a/src/xml.c b/src/xml.c
index ca4814f0..cd335e07 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -132,42 +132,68 @@ windows_info_xml_string_specs[] = {
 u64
 wim_info_get_total_bytes(const struct wim_info *info)
 {
-	if (!info)
+	if (info)
+		return info->total_bytes;
+	else
 		return 0;
-	return info->total_bytes;
 }
 
 u64
 wim_info_get_image_hard_link_bytes(const struct wim_info *info, int image)
 {
-	return info->images[image - 1].hard_link_bytes;
+	if (info)
+		return info->images[image - 1].hard_link_bytes;
+	else
+		return 0;
 }
 
 u64
 wim_info_get_image_total_bytes(const struct wim_info *info, int image)
 {
-	return info->images[image - 1].total_bytes;
+	if (info)
+		return info->images[image - 1].total_bytes;
+	else
+		return 0;
 }
 
 unsigned
 wim_info_get_num_images(const struct wim_info *info)
 {
-	return info->num_images;
+	if (info)
+		return info->num_images;
+	else
+		return 0;
 }
 
+/* Architecture constants are from w64 mingw winnt.h  */
+#define PROCESSOR_ARCHITECTURE_INTEL 0
+#define PROCESSOR_ARCHITECTURE_MIPS 1
+#define PROCESSOR_ARCHITECTURE_ALPHA 2
+#define PROCESSOR_ARCHITECTURE_PPC 3
+#define PROCESSOR_ARCHITECTURE_SHX 4
+#define PROCESSOR_ARCHITECTURE_ARM 5
+#define PROCESSOR_ARCHITECTURE_IA64 6
+#define PROCESSOR_ARCHITECTURE_ALPHA64 7
+#define PROCESSOR_ARCHITECTURE_MSIL 8
+#define PROCESSOR_ARCHITECTURE_AMD64 9
+#define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10
+
 /* Returns a statically allocated string that is a string representation of the
  * architecture number. */
 static const tchar *
 get_arch(int arch)
 {
 	switch (arch) {
-	case 0:
+	case PROCESSOR_ARCHITECTURE_INTEL:
 		return T("x86");
-	case 6:
+	case PROCESSOR_ARCHITECTURE_MIPS:
+		return T("MIPS");
+	case PROCESSOR_ARCHITECTURE_ARM:
+		return T("ARM");
+	case PROCESSOR_ARCHITECTURE_IA64:
 		return T("ia64");
-	case 9:
+	case PROCESSOR_ARCHITECTURE_AMD64:
 		return T("x86_64");
-	/* XXX Are there other arch values? */
 	default:
 		return T("unknown");
 	}
@@ -726,7 +752,11 @@ xml_write_windows_version(xmlTextWriter *writer,
 	if (rc < 0)
 		return rc;
 
-	return xmlTextWriterEndElement(writer); /* </VERSION> */
+	rc = xmlTextWriterEndElement(writer); /* </VERSION> */
+	if (rc < 0)
+		return rc;
+
+	return 0;
 }
 
 /* Writes the information contained in a `struct windows_info' to the XML
@@ -776,16 +806,19 @@ xml_write_windows_info(xmlTextWriter *writer,
 
 	if (windows_info->windows_version_exists) {
 		rc = xml_write_windows_version(writer, &windows_info->windows_version);
-		if (rc < 0)
+		if (rc)
 			return rc;
 	}
 
-	rc = xml_write_string(writer, "SYSTEMROOT",
-			      windows_info->system_root);
+	rc = xml_write_string(writer, "SYSTEMROOT", windows_info->system_root);
 	if (rc)
 		return rc;
 
-	return xmlTextWriterEndElement(writer); /* </WINDOWS> */
+	rc = xmlTextWriterEndElement(writer); /* </WINDOWS> */
+	if (rc < 0)
+		return rc;
+
+	return 0;
 }
 
 /* Writes a time element to the XML document being constructed in memory. */
@@ -871,6 +904,7 @@ xml_write_image_info(xmlTextWriter *writer, const struct image_info *image_info)
 	rc = xmlTextWriterEndElement(writer); /* </IMAGE> */
 	if (rc < 0)
 		return rc;
+
 	return 0;
 }
 
@@ -1276,6 +1310,7 @@ libxml_global_cleanup(void)
 int
 read_wim_xml_data(WIMStruct *wim)
 {
+	void *buf;
 	u8 *xml_data;
 	xmlDoc *doc;
 	xmlNode *root;
@@ -1287,9 +1322,10 @@ read_wim_xml_data(WIMStruct *wim)
 	DEBUG("Reading XML data: %"PRIu64" bytes at offset %"PRIu64"",
 	      (u64)res_entry->size, res_entry->offset);
 
-	ret = res_entry_to_data(res_entry, wim, (void**)&xml_data);
+	ret = res_entry_to_data(res_entry, wim, &buf);
 	if (ret)
 		goto out;
+	xml_data = buf;
 
 	doc = xmlReadMemory((const char *)xml_data, res_entry->original_size,
 			    NULL, "UTF-16LE", 0);
@@ -1452,6 +1488,7 @@ out_output_buffer_close:
 out_buffer_free:
 	xmlBufferFree(buf);
 out:
+	DEBUG("ret=%d", ret);
 	return ret;
 
 out_write_error:
@@ -1485,10 +1522,13 @@ write_wim_xml_data(WIMStruct *wim, int image, u64 total_bytes,
 					     WIM_RESHDR_FLAG_METADATA,
 					     &wim->out_fd,
 					     WIMLIB_COMPRESSION_TYPE_NONE,
+					     0,
 					     out_res_entry,
 					     NULL,
-					     write_resource_flags);
+					     write_resource_flags,
+					     &wim->lzx_context);
 	FREE(xml_data);
+	DEBUG("ret=%d");
 	return ret;
 }
 
@@ -1524,28 +1564,35 @@ wimlib_image_name_in_use(const WIMStruct *wim, const tchar *name)
 
 
 /* API function documented in wimlib.h  */
+WIMLIBAPI int
+wimlib_get_xml_data(WIMStruct *wim, void **buf_ret, size_t *bufsize_ret)
+{
+	if (wim->filename == NULL)
+		return WIMLIB_ERR_INVALID_PARAM;
+
+	if (buf_ret == NULL || bufsize_ret == NULL)
+		return WIMLIB_ERR_INVALID_PARAM;
+
+	*bufsize_ret = wim->hdr.xml_res_entry.original_size;
+	return res_entry_to_data(&wim->hdr.xml_res_entry, wim, buf_ret);
+}
+
 WIMLIBAPI int
 wimlib_extract_xml_data(WIMStruct *wim, FILE *fp)
 {
-	size_t size;
-	void *buf;
 	int ret;
+	void *buf;
+	size_t bufsize;
 
-	ret = res_entry_to_data(&wim->hdr.xml_res_entry, wim, &buf);
+	ret = wimlib_get_xml_data(wim, &buf, &bufsize);
 	if (ret)
-		goto out;
+		return ret;
 
-	size = wim->hdr.xml_res_entry.original_size;
-	if (fwrite(buf, 1, size, fp) != size) {
+	if (fwrite(buf, 1, bufsize, fp) != bufsize) {
 		ERROR_WITH_ERRNO("Failed to extract XML data");
 		ret = WIMLIB_ERR_WRITE;
-		goto out_free_buf;
 	}
-
-	ret = 0;
-out_free_buf:
 	FREE(buf);
-out:
 	return ret;
 }