From 789cbf51ff8a4295b4d91f7b7c81fa6abaae39d3 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Sat, 20 Jun 2026 16:57:40 +0200
Subject: [PATCH] Move Fiiles to comply more with nss layout

---
 src/nwnss/CMakeLists.txt                  |  9 +++----
 src/nwnss/library/{ => bit}/bit.c         |  0
 src/nwnss/library/{ => que}/que.c         |  0
 src/nwnss/library/{ => xCtype}/xCtype.c   |  0
 src/nwnss/library/{ => xString}/xString.c |  0
 src/nwnss/utcUserland.c                   | 31 -----------------------
 6 files changed, 4 insertions(+), 36 deletions(-)
 rename src/nwnss/library/{ => bit}/bit.c (100%)
 rename src/nwnss/library/{ => que}/que.c (100%)
 rename src/nwnss/library/{ => xCtype}/xCtype.c (100%)
 rename src/nwnss/library/{ => xString}/xString.c (100%)
 delete mode 100644 src/nwnss/utcUserland.c

diff --git a/src/nwnss/CMakeLists.txt b/src/nwnss/CMakeLists.txt
index 1e9b556..9ceba32 100644
--- a/src/nwnss/CMakeLists.txt
+++ b/src/nwnss/CMakeLists.txt
@@ -66,11 +66,10 @@ endif()
 set(NWNSS_ROOT_SOURCES
     nssUserspaceProvider.c
     nssUserspaceQuota.c
-    utcUserland.c
 )
 
 set(NWNSS_LIBRARY_SOURCES
-    library/bit.c
+    library/bit/bit.c
     library/debug/DebugHexDump.c
     library/debug/DebugPrintf.c
     library/debug/assert.c
@@ -133,7 +132,7 @@ set(NWNSS_LIBRARY_SOURCES
     library/os/worktodo.c
     library/parse/pcmdline.c
     library/qdiv.c
-    library/que.c
+    library/que/que.c
     library/stdio/aprintf.c
     library/stdio/errprintf.c
     library/stdio/getchar.c
@@ -235,8 +234,8 @@ set(NWNSS_LIBRARY_SOURCES
     library/wio/wsetpos.c
     library/wio/wsyncin.c
     library/wio/wvprintf.c
-    library/xCtype.c
-    library/xString.c
+    library/xCtype/xCtype.c
+    library/xString/xString.c
 )
 
 set(NWNSS_NSSLNXLIB_SOURCES
diff --git a/src/nwnss/library/bit.c b/src/nwnss/library/bit/bit.c
similarity index 100%
rename from src/nwnss/library/bit.c
rename to src/nwnss/library/bit/bit.c
diff --git a/src/nwnss/library/que.c b/src/nwnss/library/que/que.c
similarity index 100%
rename from src/nwnss/library/que.c
rename to src/nwnss/library/que/que.c
diff --git a/src/nwnss/library/xCtype.c b/src/nwnss/library/xCtype/xCtype.c
similarity index 100%
rename from src/nwnss/library/xCtype.c
rename to src/nwnss/library/xCtype/xCtype.c
diff --git a/src/nwnss/library/xString.c b/src/nwnss/library/xString/xString.c
similarity index 100%
rename from src/nwnss/library/xString.c
rename to src/nwnss/library/xString/xString.c
diff --git a/src/nwnss/utcUserland.c b/src/nwnss/utcUserland.c
deleted file mode 100644
index 54ebb56..0000000
--- a/src/nwnss/utcUserland.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/****************************************************************************
- |
- |  NSS userspace userland glue for imported NSS UTC helpers.
- |
- |  The NSS kernel build obtains current UTC and timezone state from the OS.
- |  the userspace NSS build keeps the same exported names but backs them with libc time(3)
- |  and UTC defaults until the wider NSS runtime is imported.
- |
- |  This program is free software; you can redistribute it and/or modify it
- |  under the terms of version 2 of the GNU General Public License as
- |  published by the Free Software Foundation.
- |
- +-------------------------------------------------------------------------*/
-#include <time.h>
-#include <include/utc.h>
-
-volatile LONG UpTimeInSeconds = 0;
-LONG NSS_TimeZoneOffset = 0;
-NINT NSS_DaylightOnOff = 0;
-LONG NSS_DaylightOffset = 0;
-
-#if !zLINUX
-BOOL IgnoreTimeZone = FALSE;
-NINT ResetTimeCache = 0;
-void (*BEASTHASH_InvalidateDOSTimesPtr)(void) = NULL;
-#endif
-
-Time_t GetUTCTime(void)
-{
-    return (Time_t)time(NULL);
-}