From 0709d31d5ef3ec19331abcd97545add26b7b0e13 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Sun, 24 Nov 2019 17:16:06 +0100
Subject: Cleanup: move canonicalize_name back to libfstree.a

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
 lib/fstree/Makemodule.am       |  1 +
 lib/fstree/canonicalize_name.c | 60 +++++++++++++++++++++++++++++++++++++++++
 lib/util/Makemodule.am         |  3 +--
 lib/util/canonicalize_name.c   | 61 ------------------------------------------
 4 files changed, 62 insertions(+), 63 deletions(-)
 create mode 100644 lib/fstree/canonicalize_name.c
 delete mode 100644 lib/util/canonicalize_name.c

(limited to 'lib')

diff --git a/lib/fstree/Makemodule.am b/lib/fstree/Makemodule.am
index be5f8fc..6638480 100644
--- a/lib/fstree/Makemodule.am
+++ b/lib/fstree/Makemodule.am
@@ -6,6 +6,7 @@ libfstree_a_SOURCES += lib/fstree/add_by_path.c
 libfstree_a_SOURCES += include/fstree.h
 libfstree_a_SOURCES += lib/fstree/gen_file_list.c
 libfstree_a_SOURCES += lib/fstree/source_date_epoch.c
+libfstree_a_SOURCES += lib/fstree/canonicalize_name.c
 libfstree_a_CFLAGS = $(AM_CFLAGS)
 libfstree_a_CPPFLAGS = $(AM_CPPFLAGS)
 
diff --git a/lib/fstree/canonicalize_name.c b/lib/fstree/canonicalize_name.c
new file mode 100644
index 0000000..f35307f
--- /dev/null
+++ b/lib/fstree/canonicalize_name.c
@@ -0,0 +1,60 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/*
+ * canonicalize_name.c
+ *
+ * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
+ */
+#include "config.h"
+#include "fstree.h"
+
+static void normalize_slashes(char *filename)
+{
+	char *dst = filename, *src = filename;
+
+	while (*src == '/' || *src == '\\')
+		++src;
+
+	while (*src != '\0') {
+		if (*src == '/' || *src == '\\') {
+			while (*src == '/' || *src == '\\')
+				++src;
+			if (*src == '\0')
+				break;
+			*(dst++) = '/';
+		} else {
+			*(dst++) = *(src++);
+		}
+	}
+
+	*dst = '\0';
+}
+
+int canonicalize_name(char *filename)
+{
+	char *dst = filename, *src = filename;
+
+	normalize_slashes(filename);
+
+	while (*src != '\0') {
+		if (src[0] == '.') {
+			if (src[1] == '\0')
+				break;
+			if (src[1] == '/') {
+				src += 2;
+				continue;
+			}
+			if (src[1] == '.' && (src[2] == '/' || src[2] == '\0'))
+				return -1;
+		}
+
+		while (*src != '\0' && *src != '/')
+			*(dst++) = *(src++);
+
+		if (*src == '/')
+			*(dst++) = *(src++);
+	}
+
+	*dst = '\0';
+	normalize_slashes(filename);
+	return 0;
+}
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
index 6a1a6a8..07e94e2 100644
--- a/lib/util/Makemodule.am
+++ b/lib/util/Makemodule.am
@@ -1,6 +1,5 @@
 libutil_la_SOURCES = include/util/util.h include/util/str_table.h
-libutil_la_SOURCES += lib/util/str_table.c lib/util/canonicalize_name.c
-libutil_la_SOURCES += lib/util/alloc.c
+libutil_la_SOURCES += lib/util/str_table.c lib/util/alloc.c
 libutil_la_CFLAGS = $(AM_CFLAGS)
 libutil_la_CPPFLAGS = $(AM_CPPFLAGS)
 libutil_la_LDFLAGS = $(AM_LDFLAGS)
diff --git a/lib/util/canonicalize_name.c b/lib/util/canonicalize_name.c
deleted file mode 100644
index 33e1c0b..0000000
--- a/lib/util/canonicalize_name.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* SPDX-License-Identifier: LGPL-3.0-or-later */
-/*
- * canonicalize_name.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "config.h"
-
-#include "util/util.h"
-
-static void normalize_slashes(char *filename)
-{
-	char *dst = filename, *src = filename;
-
-	while (*src == '/' || *src == '\\')
-		++src;
-
-	while (*src != '\0') {
-		if (*src == '/' || *src == '\\') {
-			while (*src == '/' || *src == '\\')
-				++src;
-			if (*src == '\0')
-				break;
-			*(dst++) = '/';
-		} else {
-			*(dst++) = *(src++);
-		}
-	}
-
-	*dst = '\0';
-}
-
-int canonicalize_name(char *filename)
-{
-	char *dst = filename, *src = filename;
-
-	normalize_slashes(filename);
-
-	while (*src != '\0') {
-		if (src[0] == '.') {
-			if (src[1] == '\0')
-				break;
-			if (src[1] == '/') {
-				src += 2;
-				continue;
-			}
-			if (src[1] == '.' && (src[2] == '/' || src[2] == '\0'))
-				return -1;
-		}
-
-		while (*src != '\0' && *src != '/')
-			*(dst++) = *(src++);
-
-		if (*src == '/')
-			*(dst++) = *(src++);
-	}
-
-	*dst = '\0';
-	normalize_slashes(filename);
-	return 0;
-}
-- 
cgit v1.2.3