From 48b3355c7a887530a9bd17a1ad571e402102dd95 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Fri, 9 Feb 2024 15:24:38 +0100 Subject: Remove check for OS specific stuff from is_filename_sane Signed-off-by: David Oberhollenzer --- bin/rdsquashfs/describe.c | 2 +- bin/rdsquashfs/fill_files.c | 2 +- bin/rdsquashfs/restore_fstree.c | 4 ++-- bin/sqfs2tar/write_tree.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'bin') diff --git a/bin/rdsquashfs/describe.c b/bin/rdsquashfs/describe.c index 540b126..8c0fb16 100644 --- a/bin/rdsquashfs/describe.c +++ b/bin/rdsquashfs/describe.c @@ -76,7 +76,7 @@ int describe_tree(const sqfs_tree_node_t *root, const char *unpack_root) { const sqfs_tree_node_t *n; - if (!is_filename_sane((const char *)root->name, false)) { + if (!is_filename_sane((const char *)root->name)) { fprintf(stderr, "Encountered illegal file name '%s'\n", root->name); return -1; diff --git a/bin/rdsquashfs/fill_files.c b/bin/rdsquashfs/fill_files.c index 923bc12..660ef1b 100644 --- a/bin/rdsquashfs/fill_files.c +++ b/bin/rdsquashfs/fill_files.c @@ -115,7 +115,7 @@ static void clear_file_list(void) static int gen_file_list_dfs(const sqfs_tree_node_t *n) { - if (!is_filename_sane((const char *)n->name, true)) { + if (!is_filename_sane((const char *)n->name)) { fprintf(stderr, "Found an entry named '%s', skipping.\n", n->name); return 0; diff --git a/bin/rdsquashfs/restore_fstree.c b/bin/rdsquashfs/restore_fstree.c index ea9d4f1..bfe5d86 100644 --- a/bin/rdsquashfs/restore_fstree.c +++ b/bin/rdsquashfs/restore_fstree.c @@ -129,7 +129,7 @@ static int create_node_dfs(const sqfs_tree_node_t *n, int flags) char *name; int ret; - if (!is_filename_sane((const char *)n->name, true)) { + if (!is_filename_sane((const char *)n->name)) { fprintf(stderr, "Found an entry named '%s', skipping.\n", n->name); return 0; @@ -224,7 +224,7 @@ static int set_attribs(sqfs_xattr_reader_t *xattr, char *path; int ret; - if (!is_filename_sane((const char *)n->name, true)) + if (!is_filename_sane((const char *)n->name)) return 0; if (S_ISDIR(n->inode->base.mode)) { diff --git a/bin/sqfs2tar/write_tree.c b/bin/sqfs2tar/write_tree.c index 354ec21..48697a5 100644 --- a/bin/sqfs2tar/write_tree.c +++ b/bin/sqfs2tar/write_tree.c @@ -91,7 +91,7 @@ static int write_tree_dfs(const sqfs_tree_node_t *n) name[len] = '/'; name[len + 1] = '\0'; } else { - if (!is_filename_sane((const char *)n->name, false)) { + if (!is_filename_sane((const char *)n->name)) { fprintf(stderr, "Found a file named '%s', skipping.\n", n->name); if (dont_skip) { -- cgit v1.2.3