From 5dcd267e9f0c5d93793e6d5e68279bd5dde5dff6 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Thu, 19 Sep 2019 23:51:03 +0200 Subject: Move canonicalize_name back to libutil Signed-off-by: David Oberhollenzer --- lib/util/Makemodule.am | 1 + lib/util/canonicalize_name.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 lib/util/canonicalize_name.c (limited to 'lib/util') diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am index f7e06d3..2692c01 100644 --- a/lib/util/Makemodule.am +++ b/lib/util/Makemodule.am @@ -4,6 +4,7 @@ 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/canonicalize_name.c libutil_la_CFLAGS = $(AM_CFLAGS) libutil_la_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/lib/util/canonicalize_name.c b/lib/util/canonicalize_name.c new file mode 100644 index 0000000..4abbbe9 --- /dev/null +++ b/lib/util/canonicalize_name.c @@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: LGPL-3.0-or-later */ +/* + * canonicalize_name.c + * + * Copyright (C) 2019 David Oberhollenzer + */ +#include "config.h" + +#include "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