Cleanup: move filename_sane & canonicalize_path functions to libutil

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

6 files changed, 3 insertions, 140 deletions

diff --git a/lib/fstree/Makemodule.am b/lib/fstree/Makemodule.am
index c2981ce..fec63b4 100644
--- a/lib/fstree/Makemodule.am
+++ b/lib/fstree/Makemodule.am
@@ -5,8 +5,6 @@ libfstree_a_SOURCES += lib/fstree/mknode.c lib/fstree/fstree_from_dir.c
 libfstree_a_SOURCES += lib/fstree/add_by_path.c lib/fstree/get_by_path.c
 libfstree_a_SOURCES += include/fstree.h lib/fstree/internal.h
 libfstree_a_SOURCES += lib/fstree/source_date_epoch.c
-libfstree_a_SOURCES += lib/fstree/canonicalize_name.c
-libfstree_a_SOURCES += lib/fstree/filename_sane.c
 libfstree_a_SOURCES += lib/fstree/sort_by_file.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
deleted file mode 100644
index 7fbd5a7..0000000
--- a/lib/fstree/canonicalize_name.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* 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;
-
-	while (*src != '\0') {
-		if (*src == '/') {
-			while (*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/fstree/filename_sane.c b/lib/fstree/filename_sane.c
deleted file mode 100644
index 91c15da..0000000
--- a/lib/fstree/filename_sane.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * filename_sane.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "config.h"
-#include "fstree.h"
-
-#include <string.h>
-
-#if defined(_WIN32) || defined(__WINDOWS__) || defined(TEST_WIN32)
-#ifdef _MSC_VER
-#define strncasecmp _strnicmp
-#define strcasecmp _stricmp
-#endif
-
-static const char *bad_names[] = {
-	"CON", "PRN", "AUX", "NUL",
-	"COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
-	"LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9",
-};
-
-static bool is_allowed_by_os(const char *name)
-{
-	size_t len, i;
-
-	for (i = 0; i < sizeof(bad_names) / sizeof(bad_names[0]); ++i) {
-		len = strlen(bad_names[i]);
-
-		if (strncasecmp(name, bad_names[i], len) != 0)
-			continue;
-
-		if (name[len] == '\0')
-			return false;
-
-		if (name[len] == '.' && strchr(name + len + 1, '.') == NULL)
-			return false;
-	}
-
-	return true;
-}
-#else
-static bool is_allowed_by_os(const char *name)
-{
-	(void)name;
-	return true;
-}
-#endif
-
-bool is_filename_sane(const char *name, bool check_os_specific)
-{
-	if (strcmp(name, ".") == 0 || strcmp(name, "..") == 0)
-		return false;
-
-	if (check_os_specific && !is_allowed_by_os(name))
-		return false;
-
-	while (*name != '\0') {
-		if (*name == '/')
-			return false;
-
-#if defined(_WIN32) || defined(__WINDOWS__) || defined(TEST_WIN32)
-		if (check_os_specific) {
-			if (*name == '<' || *name == '>' || *name == ':')
-				return false;
-			if (*name == '"' || *name == '|' || *name == '?')
-				return false;
-			if (*name == '*' || *name == '\\' || *name <= 31)
-				return false;
-		}
-#endif
-
-		++name;
-	}
-
-	return true;
-}
diff --git a/lib/fstree/fstree_from_file.c b/lib/fstree/fstree_from_file.c
index dd289bc..411c64f 100644
--- a/lib/fstree/fstree_from_file.c
+++ b/lib/fstree/fstree_from_file.c
@@ -6,6 +6,7 @@
  */
 #include "config.h"
 
+#include "util/util.h"
 #include "io/file.h"
 #include "fstree.h"
 #include "compat.h"
diff --git a/lib/fstree/hardlink.c b/lib/fstree/hardlink.c
index f45acf7..2165b5f 100644
--- a/lib/fstree/hardlink.c
+++ b/lib/fstree/hardlink.c
@@ -6,6 +6,7 @@
  */
 #include "config.h"
 
+#include "util/util.h"
 #include "fstree.h"
 
 #include <string.h>
diff --git a/lib/fstree/sort_by_file.c b/lib/fstree/sort_by_file.c
index 7f1f19f..ed4a58c 100644
--- a/lib/fstree/sort_by_file.c
+++ b/lib/fstree/sort_by_file.c
@@ -6,6 +6,7 @@
  */
 #include "config.h"
 
+#include "util/util.h"
 #include "fstree.h"
 #include "compat.h"