libsquashfs: Add sqfs_open_native_file function

Having a function to interpret the flags and open a native file handle
simplifies the istream/ostream/file code which shares that decoding
part, particularly on windows where the character set needs to be
transformed.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

4 files changed, 15 insertions, 12 deletions

diff --git a/bin/gensquashfs/Makemodule.am b/bin/gensquashfs/Makemodule.am
index 2e14ff6..98153cb 100644
--- a/bin/gensquashfs/Makemodule.am
+++ b/bin/gensquashfs/Makemodule.am
@@ -4,7 +4,7 @@ gensquashfs_SOURCES = bin/gensquashfs/src/mkfs.c bin/gensquashfs/src/mkfs.h \
 	bin/gensquashfs/src/fstree_from_file.c \
 	bin/gensquashfs/src/fstree_from_dir.c \
 	bin/gensquashfs/src/sort_by_file.c bin/gensquashfs/src/glob.c
-gensquashfs_LDADD = libcommon.a libsquashfs.la libfstree.a libio.a
+gensquashfs_LDADD = libcommon.a libio.a libsquashfs.la libfstree.a
 gensquashfs_LDADD += libutil.a libcompat.a $(LZO_LIBS) $(PTHREAD_LIBS)
 gensquashfs_CPPFLAGS = $(AM_CPPFLAGS)
 gensquashfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
@@ -25,8 +25,8 @@ test_filemap_xattr_SOURCES = bin/gensquashfs/test/filemap_xattr.c \
 				bin/gensquashfs/src/mkfs.h
 test_filemap_xattr_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs/src
 test_filemap_xattr_CPPFLAGS += -DTESTPATH=$(GENDATADIR)/xattr1.txt
-test_filemap_xattr_LDADD = libsquashfs.la libfstree.a libutil.a
-test_filemap_xattr_LDADD += libio.a libcompat.a
+test_filemap_xattr_LDADD = libio.a libsquashfs.la libfstree.a libutil.a
+test_filemap_xattr_LDADD += libcompat.a
 
 test_fstree_from_file_SOURCES = bin/gensquashfs/test/fstree_from_file.c \
 				bin/gensquashfs/src/fstree_from_file.c \
@@ -35,8 +35,8 @@ test_fstree_from_file_SOURCES = bin/gensquashfs/test/fstree_from_file.c \
 				bin/gensquashfs/src/mkfs.h
 test_fstree_from_file_CPPFLAGS = $(AM_CPPFLAGS)
 test_fstree_from_file_CPPFLAGS += -I$(top_srcdir)/bin/gensquashfs/src
-test_fstree_from_file_LDADD = libcommon.a libfstree.a libio.a libutil.a \
-			libcompat.a
+test_fstree_from_file_LDADD = libio.a libsquashfs.la libcommon.a libfstree.a \
+			libutil.a libcompat.a
 
 test_fstree_glob1_SOURCES = bin/gensquashfs/test/fstree_glob1.c \
 				bin/gensquashfs/src/fstree_from_file.c \
@@ -45,7 +45,8 @@ test_fstree_glob1_SOURCES = bin/gensquashfs/test/fstree_glob1.c \
 				bin/gensquashfs/src/mkfs.h
 test_fstree_glob1_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs/src
 test_fstree_glob1_CPPFLAGS += -DTESTPATH=$(GENDATADIR)
-test_fstree_glob1_LDADD = libcommon.a libfstree.a libio.a libutil.a libcompat.a
+test_fstree_glob1_LDADD = libio.a libsquashfs.la libcommon.a libfstree.a \
+			libutil.a libcompat.a
 
 test_sort_file_SOURCES = bin/gensquashfs/test/sort_file.c \
 				bin/gensquashfs/src/fstree_from_file.c \
@@ -54,7 +55,8 @@ test_sort_file_SOURCES = bin/gensquashfs/test/sort_file.c \
 				bin/gensquashfs/src/glob.c \
 				bin/gensquashfs/src/mkfs.h
 test_sort_file_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs/src
-test_sort_file_LDADD = libcommon.a libfstree.a libio.a libutil.a libcompat.a
+test_sort_file_LDADD = libio.a libsquashfs.la libcommon.a libfstree.a \
+			libutil.a libcompat.a
 
 fstree_fuzz_SOURCES = bin/gensquashfs/test/fstree_fuzz.c \
 			bin/gensquashfs/src/fstree_from_file.c \
@@ -62,7 +64,8 @@ fstree_fuzz_SOURCES = bin/gensquashfs/test/fstree_fuzz.c \
 			bin/gensquashfs/src/glob.c \
 			bin/gensquashfs/src/mkfs.h
 fstree_fuzz_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs/src
-fstree_fuzz_LDADD = libcommon.a libfstree.a libio.a libutil.a libcompat.a
+fstree_fuzz_LDADD = libio.a libsquashfs.la libcommon.a libfstree.a \
+		libutil.a libcompat.a
 
 GENSQUASHFS_TESTS = \
 	test_filemap_xattr test_fstree_from_file \
diff --git a/bin/sqfs2tar/Makemodule.am b/bin/sqfs2tar/Makemodule.am
index 9f7abf9..beb373e 100644
--- a/bin/sqfs2tar/Makemodule.am
+++ b/bin/sqfs2tar/Makemodule.am
@@ -1,8 +1,8 @@
 sqfs2tar_SOURCES = bin/sqfs2tar/src/sqfs2tar.c bin/sqfs2tar/src/sqfs2tar.h \
 	bin/sqfs2tar/src/options.c bin/sqfs2tar/src/write_tree.c
 sqfs2tar_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-sqfs2tar_LDADD = libcommon.a libutil.a libsquashfs.la libtar.a
-sqfs2tar_LDADD += libio.a libxfrm.a libcompat.a libfstree.a
+sqfs2tar_LDADD = libcommon.a libutil.a libtar.a libio.a libsquashfs.la
+sqfs2tar_LDADD += libxfrm.a libcompat.a libfstree.a
 sqfs2tar_LDADD += $(ZLIB_LIBS) $(XZ_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(BZIP2_LIBS)
 sqfs2tar_LDADD += $(PTHREAD_LIBS)
 
diff --git a/bin/sqfsdiff/Makemodule.am b/bin/sqfsdiff/Makemodule.am
index 4f21901..f520453 100644
--- a/bin/sqfsdiff/Makemodule.am
+++ b/bin/sqfsdiff/Makemodule.am
@@ -4,7 +4,7 @@ sqfsdiff_SOURCES = bin/sqfsdiff/src/sqfsdiff.c bin/sqfsdiff/src/sqfsdiff.h \
 	bin/sqfsdiff/src/compare_files.c bin/sqfsdiff/src/super.c \
 	bin/sqfsdiff/src/extract.c
 sqfsdiff_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-sqfsdiff_LDADD = libcommon.a libsquashfs.la libio.a libcompat.a libutil.a
+sqfsdiff_LDADD = libcommon.a libio.a libsquashfs.la libcompat.a libutil.a
 sqfsdiff_LDADD += $(LZO_LIBS) libfstree.a $(PTHREAD_LIBS)
 
 dist_man1_MANS += bin/sqfsdiff/sqfsdiff.1
diff --git a/bin/tar2sqfs/Makemodule.am b/bin/tar2sqfs/Makemodule.am
index 44a3346..49cfb7d 100644
--- a/bin/tar2sqfs/Makemodule.am
+++ b/bin/tar2sqfs/Makemodule.am
@@ -1,7 +1,7 @@
 tar2sqfs_SOURCES = bin/tar2sqfs/src/tar2sqfs.c bin/tar2sqfs/src/tar2sqfs.h \
 	bin/tar2sqfs/src/options.c bin/tar2sqfs/src/process_tarball.c
 tar2sqfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-tar2sqfs_LDADD = libcommon.a libtar.a libsquashfs.la libio.a libxfrm.a
+tar2sqfs_LDADD = libcommon.a libtar.a libio.a libsquashfs.la libxfrm.a
 tar2sqfs_LDADD += libfstree.a libcompat.a libfstree.a libutil.a $(LZO_LIBS)
 tar2sqfs_LDADD += $(ZLIB_LIBS) $(XZ_LIBS) $(ZSTD_LIBS) $(BZIP2_LIBS)
 tar2sqfs_LDADD += $(PTHREAD_LIBS)