* along with wimlib; if not, see http://www.gnu.org/licenses/.
*/
-#include "dentry.h"
-#include "lookup_table.h"
-#include "timestamp.h"
-#include "wimlib_internal.h"
-#include "xml.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <string.h>
+#include "wimlib/dentry.h"
+#include "wimlib/encoding.h"
+#include "wimlib/error.h"
+#include "wimlib/file_io.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#include "wimlib/resource.h"
+#include "wimlib/timestamp.h"
+#include "wimlib/xml.h"
+
+#include <libxml/encoding.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xmlwriter.h>
-#include <libxml/encoding.h>
#include <limits.h>
+#include <string.h>
/* Structures used to form an in-memory representation of the XML data (other
* than the raw parse tree from libxml). */
tchar *display_name;
tchar *display_description;
tchar *flags;
+ struct wim_lookup_table *lookup_table; /* temporary field */
};
struct xml_string_spec {
}
if (!image_info->name) {
tchar *empty_name;
- WARNING("Image with index %d has no name", image_info->index);
- empty_name = TMALLOC(1);
+ /*WARNING("Image with index %d has no name", image_info->index);*/
+ empty_name = MALLOC(sizeof(tchar));
if (!empty_name)
return WIMLIB_ERR_NOMEM;
*empty_name = T('\0');
* link bytes", and this size is multiplied by the link count (NOT one
* less than the link count).
*/
- lte = inode_unnamed_lte_resolved(inode);
+ lte = inode_unnamed_lte(inode, info->lookup_table);
if (lte) {
info->total_bytes += wim_resource_size(lte);
if (!dentry_is_first_in_inode(dentry))
if (inode->i_nlink >= 2 && dentry_is_first_in_inode(dentry)) {
for (unsigned i = 0; i < inode->i_num_ads; i++) {
if (inode->i_ads_entries[i].stream_name_nbytes) {
- lte = inode_stream_lte_resolved(inode, i + 1);
+ lte = inode_stream_lte(inode, i + 1, info->lookup_table);
if (lte) {
info->hard_link_bytes += inode->i_nlink *
wim_resource_size(lte);
image_info->dir_count = 0;
image_info->total_bytes = 0;
image_info->hard_link_bytes = 0;
+ image_info->lookup_table = w->lookup_table;
for_dentry_in_tree(w->image_metadata[image - 1]->root_dentry,
calculate_dentry_statistics,
wim_timestamp_to_str(image_info->creation_time, buf, sizeof(buf));
tprintf(T("Creation Time: %"TS"\n"), buf);
- wim_timestamp_to_str(image_info->creation_time, buf, sizeof(buf));
+ wim_timestamp_to_str(image_info->last_modification_time, buf, sizeof(buf));
tprintf(T("Last Modification Time: %"TS"\n"), buf);
if (image_info->windows_info_exists)
print_windows_info(&image_info->windows_info);
}
void
-libxml_global_init()
+libxml_global_init(void)
{
xmlInitParser();
xmlInitCharEncodingHandlers();
}
void
-libxml_global_cleanup()
+libxml_global_cleanup(void)
{
xmlCleanupParser();
xmlCleanupCharEncodingHandlers();
* Reads the XML data from a WIM file.
*/
int
-read_xml_data(FILE *fp, const struct resource_entry *res_entry,
+read_xml_data(int in_fd,
+ const struct resource_entry *res_entry,
struct wim_info **info_ret)
{
utf16lechar *xml_data;
goto out;
}
- ret = read_uncompressed_resource(fp, res_entry->offset,
- res_entry->size, xml_data);
- if (ret)
+ if (full_pread(in_fd, xml_data,
+ res_entry->size, res_entry->offset) != res_entry->size)
+ {
+ ERROR_WITH_ERRNO("Error reading XML data");
+ ret = WIMLIB_ERR_READ;
goto out_free_xml_data;
+ }
/* Null-terminate just in case */
((u8*)xml_data)[res_entry->size] = 0;
return ret;
}
-#define CHECK_RET ({ if (ret < 0) { \
- ERROR("Error writing XML data"); \
- ret = WIMLIB_ERR_WRITE; \
- goto out_free_text_writer; \
- } })
-
/*
* Writes XML data to a WIM file.
*
* the offset of the XML data.
*/
int
-write_xml_data(const struct wim_info *wim_info, int image, FILE *out,
+write_xml_data(const struct wim_info *wim_info, int image, int out_fd,
u64 total_bytes, struct resource_entry *out_res_entry)
{
xmlCharEncodingHandler *encoding_handler;
(wim_info != NULL && image >= 1 &&
image <= wim_info->num_images));
- start_offset = ftello(out);
+ start_offset = filedes_offset(out_fd);
if (start_offset == -1)
return WIMLIB_ERR_WRITE;
/* 2 bytes endianness marker for UTF-16LE. This is _required_ for WIM
* XML data. */
- if ((putc(0xff, out)) == EOF || (putc(0xfe, out) == EOF)) {
+ static u8 bom[2] = {0xff, 0xfe};
+ if (full_write(out_fd, bom, 2) != 2) {
ERROR_WITH_ERRNO("Error writing XML data");
return WIMLIB_ERR_WRITE;
}
goto out;
}
- out_buffer = xmlOutputBufferCreateFile(out, encoding_handler);
+ out_buffer = xmlOutputBufferCreateFd(out_fd, encoding_handler);
if (!out_buffer) {
ERROR("Failed to allocate xmlOutputBuffer");
ret = WIMLIB_ERR_NOMEM;
DEBUG("Writing <WIM> element");
ret = xmlTextWriterStartElement(writer, "WIM");
- CHECK_RET;
+ if (ret < 0)
+ goto out_write_error;
ret = xmlTextWriterWriteFormatElement(writer, "TOTALBYTES", "%"PRIu64,
total_bytes);
- CHECK_RET;
+ if (ret < 0)
+ goto out_write_error;
if (wim_info != NULL) {
int first, last;
for (int i = first; i <= last; i++) {
ret = xml_write_image_info(writer, &wim_info->images[i - 1]);
if (ret) {
- CHECK_RET;
+ if (ret < 0)
+ goto out_write_error;
goto out_free_text_writer;
}
}
}
ret = xmlTextWriterEndElement(writer);
- CHECK_RET;
+ if (ret < 0)
+ goto out_write_error;
ret = xmlTextWriterEndDocument(writer);
- CHECK_RET;
+ if (ret < 0)
+ goto out_write_error;
- DEBUG("Ended XML document");
+ ret = xmlTextWriterFlush(writer);
+ if (ret < 0)
+ goto out_write_error;
- /* Call xmlFreeTextWriter() before ftello() because the former will
- * flush the file stream. */
- xmlFreeTextWriter(writer);
- writer = NULL;
+ DEBUG("Ended XML document");
- end_offset = ftello(out);
+ end_offset = filedes_offset(out_fd);
if (end_offset == -1) {
ret = WIMLIB_ERR_WRITE;
} else {
out_free_text_writer:
/* xmlFreeTextWriter will free the attached xmlOutputBuffer. */
xmlFreeTextWriter(writer);
- out_buffer = NULL;
+ goto out;
out_output_buffer_close:
- if (out_buffer != NULL)
- xmlOutputBufferClose(out_buffer);
+ xmlOutputBufferClose(out_buffer);
out:
if (ret == 0)
DEBUG("Successfully wrote XML data");
return ret;
+out_write_error:
+ ERROR("Error writing XML data");
+ ret = WIMLIB_ERR_WRITE;
+ goto out_free_text_writer;
}
/* Returns the name of the specified image. */
WIMLIBAPI int
wimlib_extract_xml_data(WIMStruct *w, FILE *fp)
{
- size_t bytes_written;
size_t size;
void *buf;
int ret;
if (!buf)
return WIMLIB_ERR_NOMEM;
- ret = read_uncompressed_resource(w->fp, w->hdr.xml_res_entry.offset,
- size, buf);
- if (ret)
+ if (full_pread(w->in_fd,
+ buf,
+ w->hdr.xml_res_entry.size,
+ w->hdr.xml_res_entry.offset) != w->hdr.xml_res_entry.size)
+ {
+ ERROR_WITH_ERRNO("Error reading XML data");
+ ret = WIMLIB_ERR_READ;
goto out_free_buf;
+ }
if (fwrite(buf, 1, size, fp) != size) {
ERROR_WITH_ERRNO("Failed to extract XML data");
{
tchar *p;
int i;
+ int ret;
DEBUG("Setting the name of image %d to %"TS, image, name);
- if (!name || !*name) {
- ERROR("Must specify a non-empty string for the image name");
- return WIMLIB_ERR_INVALID_PARAM;
- }
+ ret = can_modify_wim(w);
+ if (ret)
+ return ret;
+
+ if (name == NULL)
+ name = T("");
if (image < 1 || image > w->hdr.image_count) {
ERROR("%d is not a valid image", image);
for (i = 1; i <= w->hdr.image_count; i++) {
if (i == image)
continue;
- if (tstrcmp(w->wim_info->images[i - 1].name, name) == 0) {
+ if (!tstrcmp(w->wim_info->images[i - 1].name, name)) {
ERROR("The name \"%"TS"\" is already in use in the WIM!",
name);
return WIMLIB_ERR_IMAGE_NAME_COLLISION;
{
tchar *tstr_copy;
tchar **dest_tstr_p;
+ int ret;
+
+ ret = can_modify_wim(w);
+ if (ret)
+ return ret;
if (image < 1 || image > w->hdr.image_count) {
ERROR("%d is not a valid image", image);
git://wimlib.net / wimlib / blobdiff