aboutsummaryrefslogtreecommitdiff
path: root/lib/fstree
diff options
context:
space:
mode:
Diffstat (limited to 'lib/fstree')
-rw-r--r--lib/fstree/Makemodule.am1
-rw-r--r--lib/fstree/canonicalize_name.c61
2 files changed, 0 insertions, 62 deletions
diff --git a/lib/fstree/Makemodule.am b/lib/fstree/Makemodule.am
index 00150fd..d282de7 100644
--- a/lib/fstree/Makemodule.am
+++ b/lib/fstree/Makemodule.am
@@ -5,7 +5,6 @@ libfstree_a_SOURCES += lib/fstree/node_stat.c lib/fstree/mknode.c
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
-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)
diff --git a/lib/fstree/canonicalize_name.c b/lib/fstree/canonicalize_name.c
deleted file mode 100644
index 15c02be..0000000
--- a/lib/fstree/canonicalize_name.c
+++ /dev/null
@@ -1,61 +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 == '\\')
- ++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;
-}