Rectified handling of oversized filenames by new API calls:

iso_image_set_truncate_mode, iso_image_get_truncate_mode,
iso_truncate_leaf_name, iso_image_set_node_name, iso_image_tree_clone,
iso_image_add_new_dir, iso_image_add_new_file, iso_image_add_new_special,
iso_image_add_new_symlink, iso_image_dir_get_node, iso_image_path_to_node,
This commit is contained in:
2015-09-17 13:59:05 +02:00
parent 7ac5b75748
commit 7a3560035a
12 changed files with 847 additions and 63 deletions

View File

@ -21,6 +21,7 @@
#include "image.h"
#include "aaip_0_2.h"
#include "util.h"
#include "messages.h"
#include <stdlib.h>
#include <string.h>
@ -72,8 +73,12 @@ int default_create_file(IsoNodeBuilder *builder, IsoImage *image,
iso_file_source_ref(src);
name = iso_file_source_get_name(src);
if (strlen(name) > LIBISOFS_NODE_NAME_MAX)
name[LIBISOFS_NODE_NAME_MAX] = 0;
if ((int) strlen(name) > image->truncate_length) {
ret = iso_truncate_rr_name(image->truncate_mode,
image->truncate_length, name, 0);
if (ret < 0)
return ret;
}
ret = iso_node_new_file(name, stream, &node);
if (ret < 0) {
iso_stream_unref(stream);
@ -131,8 +136,12 @@ int default_create_node(IsoNodeBuilder *builder, IsoImage *image,
}
}
if (strlen(name) > LIBISOFS_NODE_NAME_MAX)
name[LIBISOFS_NODE_NAME_MAX] = 0;
if ((int) strlen(name) > image->truncate_length) {
ret = iso_truncate_rr_name(image->truncate_mode,
image->truncate_length, name, 0);
if (ret < 0)
goto ex;
}
fs = iso_file_source_get_filesystem(src);
new = NULL;