From d6e2106e96b6969e045251d972e1adcceb9728df Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Tue, 5 Jul 2022 15:34:08 +0200
Subject: Cleanup: move filename_sane & canonicalize_path functions to libutil

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
 bin/gensquashfs/Makemodule.am | 2 +-
 bin/gensquashfs/mkfs.h        | 1 +
 bin/sqfs2tar/sqfs2tar.h       | 3 ++-
 bin/tar2sqfs/Makemodule.am    | 2 +-
 bin/tar2sqfs/tar2sqfs.h       | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/gensquashfs/Makemodule.am b/bin/gensquashfs/Makemodule.am
index 03f4f4c..b0b8a79 100644
--- a/bin/gensquashfs/Makemodule.am
+++ b/bin/gensquashfs/Makemodule.am
@@ -2,7 +2,7 @@ gensquashfs_SOURCES = bin/gensquashfs/mkfs.c bin/gensquashfs/mkfs.h
 gensquashfs_SOURCES += bin/gensquashfs/options.c bin/gensquashfs/selinux.c
 gensquashfs_SOURCES += bin/gensquashfs/dirscan_xattr.c
 gensquashfs_LDADD = libcommon.a libsquashfs.la libfstree.a libio.a
-gensquashfs_LDADD += libcompat.a $(LZO_LIBS) $(PTHREAD_LIBS)
+gensquashfs_LDADD += libutil.a libcompat.a $(LZO_LIBS) $(PTHREAD_LIBS)
 gensquashfs_CPPFLAGS = $(AM_CPPFLAGS)
 gensquashfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 
diff --git a/bin/gensquashfs/mkfs.h b/bin/gensquashfs/mkfs.h
index 4f455bd..2697d3e 100644
--- a/bin/gensquashfs/mkfs.h
+++ b/bin/gensquashfs/mkfs.h
@@ -11,6 +11,7 @@
 
 #include "common.h"
 #include "fstree.h"
+#include "util/util.h"
 
 #ifdef HAVE_SYS_XATTR_H
 #include <sys/xattr.h>
diff --git a/bin/sqfs2tar/sqfs2tar.h b/bin/sqfs2tar/sqfs2tar.h
index 4575793..71b491d 100644
--- a/bin/sqfs2tar/sqfs2tar.h
+++ b/bin/sqfs2tar/sqfs2tar.h
@@ -9,8 +9,9 @@
 
 #include "config.h"
 #include "common.h"
-#include "tar/tar.h"
 
+#include "util/util.h"
+#include "tar/tar.h"
 #include "io/xfrm.h"
 
 #include <getopt.h>
diff --git a/bin/tar2sqfs/Makemodule.am b/bin/tar2sqfs/Makemodule.am
index 818f6e2..a9c503f 100644
--- a/bin/tar2sqfs/Makemodule.am
+++ b/bin/tar2sqfs/Makemodule.am
@@ -2,7 +2,7 @@ tar2sqfs_SOURCES = bin/tar2sqfs/tar2sqfs.c bin/tar2sqfs/tar2sqfs.h
 tar2sqfs_SOURCES += bin/tar2sqfs/options.c bin/tar2sqfs/process_tarball.c
 tar2sqfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 tar2sqfs_LDADD = libcommon.a libsquashfs.la libtar.a libio.a
-tar2sqfs_LDADD += libfstree.a libcompat.a libfstree.a $(LZO_LIBS)
+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)
 
diff --git a/bin/tar2sqfs/tar2sqfs.h b/bin/tar2sqfs/tar2sqfs.h
index 40c3b75..6e4d123 100644
--- a/bin/tar2sqfs/tar2sqfs.h
+++ b/bin/tar2sqfs/tar2sqfs.h
@@ -11,6 +11,7 @@
 #include "common.h"
 #include "compat.h"
 
+#include "util/util.h"
 #include "tar/tar.h"
 #include "tar/format.h"
 #include "io/xfrm.h"
-- 
cgit v1.2.3