Cleanup: move canonicalize_name back to libfstree.a

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

2 files changed, 1 insertions, 63 deletions

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;
-}