aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-01 14:11:51 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-01 14:11:51 +0200
commit79c333899d318bf9b1eec3837833c7f0229d1906 (patch)
treed31f6513d6284bcc8dc9a7ec8523ec2fdfa1944c /lib
parent3b43f166629efbb34e1b0ceeaa2f06452d0fed2f (diff)
Move some application specific stuff out of libutil
This commit does the following: - canonicalize_name is moved to libfstree - source_date_epoch is only used inside libfstree, so it's also moved over and can later be completely internalized - print_version is moved over to sqfshelper. Mainly so it doesn't end up in libsquashfs.so for no sane reason. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib')
-rw-r--r--lib/Makemodule.am8
-rw-r--r--lib/fstree/canonicalize_name.c (renamed from lib/util/canonicalize_name.c)2
-rw-r--r--lib/fstree/source_date_epoch.c (renamed from lib/util/source_date_epoch.c)2
-rw-r--r--lib/sqfshelper/print_version.c (renamed from lib/util/print_version.c)0
4 files changed, 7 insertions, 5 deletions
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index bc08cc9..7b63274 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -6,6 +6,8 @@ libfstree_a_SOURCES += lib/fstree/add_by_path.c lib/fstree/xattr.c
libfstree_a_SOURCES += lib/fstree/node_from_path.c include/fstree.h
libfstree_a_SOURCES += lib/fstree/gen_file_list.c lib/fstree/deduplicate.c
libfstree_a_SOURCES += lib/fstree/optimize_unpack_order.c
+libfstree_a_SOURCES += lib/fstree/canonicalize_name.c
+libfstree_a_SOURCES += lib/fstree/source_date_epoch.c
libfstree_a_CFLAGS = $(AM_CFLAGS) $(LIBSELINUX_CFLAGS)
libfstree_a_CPPFLAGS = $(AM_CPPFLAGS)
@@ -26,17 +28,17 @@ libsqfshelper_a_SOURCES += lib/sqfshelper/write_dir.c
libsqfshelper_a_SOURCES += lib/sqfshelper/write_inode.c
libsqfshelper_a_SOURCES += lib/sqfshelper/write_export_table.c
libsqfshelper_a_SOURCES += lib/sqfshelper/xattr_reader.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/print_version.c
libsqfshelper_a_SOURCES += include/data_reader.h lib/sqfshelper/data_reader.c
libsqfshelper_a_SOURCES += include/data_writer.h lib/sqfshelper/data_writer.c
libsqfshelper_a_SOURCES += include/xattr_reader.h lib/sqfshelper/write_xattr.c
-libutil_la_SOURCES = lib/util/canonicalize_name.c lib/util/write_data.c
+libutil_la_SOURCES = lib/util/write_data.c
libutil_la_SOURCES += lib/util/read_data.c include/util.h
-libutil_la_SOURCES += lib/util/print_version.c lib/util/mkdir_p.c
+libutil_la_SOURCES += lib/util/mkdir_p.c
libutil_la_SOURCES += lib/util/str_table.c include/str_table.h
libutil_la_SOURCES += lib/util/dirstack.c lib/util/padd_file.c
libutil_la_SOURCES += lib/util/read_data_at.c lib/util/alloc.c
-libutil_la_SOURCES += lib/util/source_date_epoch.c
libutil_la_CFLAGS = $(AM_CFLAGS)
libutil_la_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/lib/util/canonicalize_name.c b/lib/fstree/canonicalize_name.c
index f99bc2a..15c02be 100644
--- a/lib/util/canonicalize_name.c
+++ b/lib/fstree/canonicalize_name.c
@@ -6,7 +6,7 @@
*/
#include "config.h"
-#include "util.h"
+#include "fstree.h"
static void normalize_slashes(char *filename)
{
diff --git a/lib/util/source_date_epoch.c b/lib/fstree/source_date_epoch.c
index 1397e52..bbf2e42 100644
--- a/lib/util/source_date_epoch.c
+++ b/lib/fstree/source_date_epoch.c
@@ -5,7 +5,7 @@
* Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
*/
#include "config.h"
-#include "util.h"
+#include "fstree.h"
#include <stdlib.h>
#include <stdio.h>
diff --git a/lib/util/print_version.c b/lib/sqfshelper/print_version.c
index b23e2bd..b23e2bd 100644
--- a/lib/util/print_version.c
+++ b/lib/sqfshelper/print_version.c