From 79c333899d318bf9b1eec3837833c7f0229d1906 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Sun, 1 Sep 2019 14:11:51 +0200
Subject: Move some application specific stuff out of libutil

This commit does the following:
 - canonicalize_name is moved to libfstree
 - source_date_epoch is only used inside libfstree, so it's also moved
   over and can later be completely internalized
 - print_version is moved over to sqfshelper. Mainly so it doesn't end
   up in libsquashfs.so for no sane reason.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
 lib/fstree/canonicalize_name.c | 61 ++++++++++++++++++++++++++++++++++++++++++
 lib/fstree/source_date_epoch.c | 45 +++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 lib/fstree/canonicalize_name.c
 create mode 100644 lib/fstree/source_date_epoch.c

(limited to 'lib/fstree')

diff --git a/lib/fstree/canonicalize_name.c b/lib/fstree/canonicalize_name.c
new file mode 100644
index 0000000..15c02be
--- /dev/null
+++ b/lib/fstree/canonicalize_name.c
@@ -0,0 +1,61 @@
+/* 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/fstree/source_date_epoch.c b/lib/fstree/source_date_epoch.c
new file mode 100644
index 0000000..bbf2e42
--- /dev/null
+++ b/lib/fstree/source_date_epoch.c
@@ -0,0 +1,45 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/*
+ * source_date_epoch.h
+ *
+ * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
+ */
+#include "config.h"
+#include "fstree.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+
+uint32_t get_source_date_epoch(void)
+{
+	const char *str, *ptr;
+	uint32_t x, tval = 0;
+
+	str = getenv("SOURCE_DATE_EPOCH");
+
+	if (str == NULL || *str == '\0')
+		return 0;
+
+	for (ptr = str; *ptr != '\0'; ++ptr) {
+		if (!isdigit(*ptr))
+			goto fail_nan;
+
+		x = (*ptr) - '0';
+
+		if (tval > (UINT32_MAX - x) / 10)
+			goto fail_ov;
+
+		tval = tval * 10 + x;
+	}
+
+	return tval;
+fail_ov:
+	fprintf(stderr, "WARNING: SOURCE_DATE_EPOCH=%s does not fit into "
+		"32 bit integer\n", str);
+	return 0;
+fail_nan:
+	fprintf(stderr, "WARNING: SOURCE_DATE_EPOCH=%s is not a positive "
+		"number\n", str);
+	return 0;
+}
-- 
cgit v1.2.3