AmigaLabs · afxgroup · Aug 16, 2025 · Jan 28, 2025 · Apr 15, 2025 · Jun 11, 2025
diff --git a/library/crtbegin.c b/library/crtbegin.c
@@ -129,7 +129,6 @@ clib4_start(char *args, const int32 arglen, struct Library *sysbase) {
         struct MsgPort *mp = &me->pr_MsgPort;
         iexec->WaitPort(mp);
         sms = (struct WBStartup *) iexec->GetMsg(mp);
-        iexec->DebugPrintF("<crtbegin> : NumArgs == %ld\n", sms->sm_NumArgs);
     }
 
     IExec = iexec;

diff --git a/library/dos.h b/library/dos.h
@@ -316,9 +316,8 @@ struct _clib4 {
     BOOL __current_directory_changed;
     BOOL __unlock_current_directory;
 
-    /* Memalign memory list */
-    void *unused2;
-    void *unused3;
+    APTR __environment_lock;
+    void *resolv_conf; //struct resolvconf
 
     /*
      * This variable can be set up to contain the minimum stack size the program

diff --git a/library/fcntl/open.c b/library/fcntl/open.c
@@ -362,8 +362,8 @@ __open_r(struct _clib4 *__clib4, const char *path_name, int open_flag, ... /* mo
             SET_FLAG(fd->fd_Flags, FDF_CREATED);
     }
     if (FLAG_IS_SET(open_flag, O_LITTLE_ENDIAN)) {
-        DebugPrintF("open() called with Little Endian mode\n");
-        DebugPrintF("%ld\n", fd_slot_number);
+        SHOWMSG("open() called with Little Endian mode\n");
+        D(("%ld\n", fd_slot_number));
         SET_FLAG(fd->fd_Flags, FDF_LITTLE_ENDIAN);
     }
 

diff --git a/library/fcntl/read.c b/library/fcntl/read.c
@@ -119,7 +119,7 @@ read(int file_descriptor, void *buffer, size_t num_bytes) {
 
     struct fd *fd = __get_file_descriptor(__clib4, file_descriptor);
     if (!FLAG_IS_SET(fd->fd_Flags, FDF_IS_SOCKET) && FLAG_IS_SET(fd->fd_Flags, FDF_LITTLE_ENDIAN)) {
-        DebugPrintF("[read] Reading in Little endian mode\n");
+        SHOWMSG("[read] Reading in Little endian mode\n");
         if (num_bytes == 2) {
             byteswap16(buffer);
         } else if (num_bytes == 4) {

diff --git a/library/include/sys/socket.h b/library/include/sys/socket.h
@@ -17,6 +17,8 @@
 #include <sys/time.h>
 #endif /* _SYS_TIME_H */
 
+#include <fcntl.h>
+
 #include <features.h>
 
 __BEGIN_DECLS
@@ -49,7 +51,7 @@ typedef unsigned char sa_family_t;
 
 #ifndef SOCK_CLOEXEC
 #define SOCK_CLOEXEC   0    /* for now set bot to 0 */
-#define SOCK_NONBLOCK  0
+#define SOCK_NONBLOCK  O_NONBLOCK
 #endif
 
 /*

diff --git a/library/libc_init_global.c b/library/libc_init_global.c
@@ -38,6 +38,8 @@
 #include <proto/elf.h>
 #include <fenv.h>
 
+#include "resolv/lookup.h"
+
 extern struct ElfIFace *__IElf;
 extern struct Library *__ElfBase;
 
@@ -150,28 +152,35 @@ reent_init(struct _clib4 *__clib4, const BOOL fallback) {
         ._iob_pool = NULL,
         .isTZSet = 0,
         .__IDebug = NULL,
+        .resolv_conf = NULL,
     };
 
     if (!__clib4->__random_lock || !__clib4->__pipe_semaphore) {
         goto out;
     }
 
     SHOWMSG("Allocating file IO pool");
-    __clib4->_iob_pool = AllocSysObjectTags(ASOT_MEMPOOL,
-                                               ASOPOOL_Puddle,		BUFSIZ + 32,
-                                               ASOPOOL_Threshold,	BUFSIZ + 32,
+    __clib4->_iob_pool = AllocSysObjectTags(ASOT_ITEMPOOL,
+                                               ASOITEM_MFlags,   MEMF_ANY | MEMF_CLEAR,
+                                               ASOITEM_ItemSize, BUFSIZ + 32,
                                                TAG_DONE);
     if (!__clib4->_iob_pool) {
         goto out;
     }
-    DebugPrintF("Allocated file IO pool. _iob_pool : 0x%lx\n", __clib4->_iob_pool);
+    D(("Allocated file IO pool. _iob_pool : 0x%lx\n", __clib4->_iob_pool));
 
     SHOWMSG("Allocating wide_status");
     /* Initialize wchar stuff */
     __clib4->wide_status = AllocVecTags(sizeof(struct _wchar), AVT_Type, MEMF_SHARED, TAG_DONE);
     if (!__clib4->wide_status) {
         goto out;
     }
+
+    __clib4->resolv_conf = AllocVecTags(sizeof(struct resolvconf), AVT_Type, MEMF_SHARED, AVT_ClearWithValue, 0, TAG_DONE);
+    if (!__clib4->resolv_conf) {
+        goto out;
+    }
+
     __clib4->wide_status->_strtok_last = NULL;
     __clib4->wide_status->_mblen_state.__count = 0;
     __clib4->wide_status->_mblen_state.__value.__wch = 0;
@@ -270,11 +279,14 @@ void
 reent_exit(struct _clib4 *__clib4) {
     /* Free global clib structure */
     if (__clib4) {
+        if (__clib4->resolv_conf != NULL) {
+            FreeVec(__clib4->resolv_conf);
+            __clib4->resolv_conf = NULL;
+        }
         /* Free IO memory pool */
         if (__clib4->_iob_pool != NULL) {
-            SHOWMSG("Freeing _iob_pool and all unfreed memory");
-            DebugPrintF("Freeing _iob_pool and all unfreed memory. _iob_pool : 0x%lx\n", __clib4->_iob_pool);
-            FreeSysObject(ASOT_MEMPOOL, __clib4->_iob_pool);
+            D(("Freeing _iob_pool and all unfreed memory. _iob_pool : 0x%lx\n", __clib4->_iob_pool));
+            FreeSysObject(ASOT_ITEMPOOL, __clib4->_iob_pool);
         }
 
         /* Free wchar stuff */

diff --git a/library/pthread/common.h b/library/pthread/common.h
@@ -97,9 +97,9 @@ typedef struct {
 extern struct Library *_DOSBase;
 extern struct DOSIFace *_IDOS;
 
-extern struct SignalSemaphore thread_sem;
+extern APTR thread_sem;
 extern ThreadInfo threads[PTHREAD_THREADS_MAX];
-extern struct SignalSemaphore tls_sem;
+extern APTR tls_sem;
 extern TLSKey tlskeys[PTHREAD_KEYS_MAX];
 extern APTR timerMutex;
 extern struct TimeRequest *timedTimerIO;

diff --git a/library/pthread/pthread.c b/library/pthread/pthread.c
@@ -49,9 +49,9 @@ void __attribute__((constructor, used)) __pthread_init();
 void __attribute__((destructor, used)) __pthread_exit();
 
 ThreadInfo threads[PTHREAD_THREADS_MAX];
-struct SignalSemaphore thread_sem;
+APTR thread_sem = NULL;
 TLSKey tlskeys[PTHREAD_KEYS_MAX];
-struct SignalSemaphore tls_sem;
+APTR tls_sem = NULL;
 APTR timerMutex = NULL;
 struct TimeRequest *timedTimerIO = NULL;
 struct MsgPort *timedTimerPort = NULL;
@@ -269,10 +269,11 @@ static void set_tls_register(ThreadInfo *ti) {
 
 int __pthread_init_func(void) {
     pthread_t i;
+    SHOWMSG("[__pthread_init_func :] Pthread __pthread_init_func called.\n");
 
     memset(&threads, 0, sizeof(threads));
-    InitSemaphore(&thread_sem);
-    InitSemaphore(&tls_sem);
+    thread_sem = AllocSysObjectTags(ASOT_MUTEX, ASOMUTEX_Recursive, TRUE, TAG_DONE);
+    tls_sem = AllocSysObjectTags(ASOT_MUTEX, ASOMUTEX_Recursive, TRUE, TAG_DONE);
 
     // reserve ID 0 for the main thread
     ThreadInfo *inf = &threads[0];
@@ -306,7 +307,16 @@ void __pthread_exit_func(void) {
     pthread_t i;
     ThreadInfo *inf;
     struct DOSIFace *IDOS = _IDOS;
+    SHOWMSG("[__pthread_exit_func :] Pthread __pthread_exit_func called.\n");
 
+    if (thread_sem) {
+        FreeSysObject(ASOT_MUTEX, thread_sem);
+        thread_sem = NULL;
+    }
+    if (tls_sem) {
+        FreeSysObject(ASOT_MUTEX, tls_sem);
+        tls_sem = NULL;
+    }
     if (timerMutex) {
         FreeSysObject(ASOT_MUTEX, timerMutex);
         timerMutex = NULL;
@@ -340,7 +350,7 @@ void __pthread_exit_func(void) {
 
 PTHREAD_CONSTRUCTOR(__pthread_init) {
     ENTER();
-    DebugPrintF("[__pthread_init :] Pthread constructor called.\n");
+    SHOWMSG("[__pthread_init :] Pthread constructor called.\n");
     _DOSBase = OpenLibrary("dos.library", MIN_OS_VERSION);
     if (_DOSBase) {
         _IDOS = (struct DOSIFace *) GetInterface((struct Library *) _DOSBase, "main", 1, NULL);
@@ -356,6 +366,7 @@ PTHREAD_CONSTRUCTOR(__pthread_init) {
 
 PTHREAD_DESTRUCTOR(__pthread_exit) {
     ENTER();
+    SHOWMSG("[__pthread_exit :] Pthread destructor called.\n");
     if (_DOSBase != NULL) {
         CloseLibrary(_DOSBase);
         _DOSBase = NULL;

diff --git a/library/pthread/pthread_cleanup_push.c b/library/pthread/pthread_cleanup_push.c
@@ -50,6 +50,8 @@ pthread_cleanup_push(void (*routine)(void *), void *arg) {
         return;
 
     inf = GetCurrentThreadInfo();
+	if (!inf)
+		return;
 
     handler->routine = routine;
     handler->arg = arg;

diff --git a/library/pthread/pthread_create.c b/library/pthread/pthread_create.c
@@ -39,7 +39,7 @@
 
 extern struct DOSIFace *_IDOS;
 
-static inline void set_tls_register(ThreadInfo *ti) {
+static void set_tls_register(ThreadInfo *ti) {
   __asm__ volatile("mr r2, %0" :: "r"(ti));
 }
 
@@ -80,7 +80,7 @@ StarterFunc() {
 
     // destroy all non-NULL TLS key values
     // since the destructors can set the keys themselves, we have to do multiple iterations
-    ObtainSemaphoreShared(&tls_sem);
+    MutexObtain(tls_sem);
     for (int j = 0; keyFound && j < PTHREAD_DESTRUCTOR_ITERATIONS; j++) {
         keyFound = FALSE;
         for (int i = 0; i < PTHREAD_KEYS_MAX; i++) {
@@ -92,7 +92,7 @@ StarterFunc() {
             }
         }
     }
-    ReleaseSemaphore(&tls_sem);
+    MutexRelease(tls_sem);
 
     if (stackSwapped)
         StackSwap(&stack);
@@ -104,9 +104,9 @@ StarterFunc() {
         Signal((struct Task *) inf->parent, SIGF_PARENT);
     } else {
         // no one is waiting for us, do the clean up
-        ObtainSemaphore(&thread_sem);
+        MutexObtain(thread_sem);
         _pthread_clear_threadinfo(inf);
-        ReleaseSemaphore(&thread_sem);
+        MutexRelease(thread_sem);
     }
 
     return RETURN_OK;
@@ -125,12 +125,12 @@ pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start)(voi
         return EINVAL;
 
     // grab an empty thread slot
-    ObtainSemaphore(&thread_sem);
+    MutexObtain(thread_sem);
     threadnew = GetThreadId(NULL);
-    ReleaseSemaphore(&thread_sem);
+    MutexRelease(thread_sem);
 
     if (threadnew == PTHREAD_THREADS_MAX) {
-        ReleaseSemaphore(&thread_sem);
+        MutexRelease(thread_sem);
         return EAGAIN;
     }
 

diff --git a/library/pthread/pthread_join.c b/library/pthread/pthread_join.c
@@ -61,9 +61,9 @@ pthread_join(pthread_t thread, void **value_ptr) {
     if (value_ptr)
         *value_ptr = inf->ret;
 
-    ObtainSemaphore(&thread_sem);
+    MutexObtain(thread_sem);
     _pthread_clear_threadinfo(inf);
-    ReleaseSemaphore(&thread_sem);
+    MutexRelease(thread_sem);
 
     return 0;
 }
diff --git a/library/pthread/pthread_key_create.c b/library/pthread/pthread_key_create.c
@@ -45,23 +45,23 @@ pthread_key_create(pthread_key_t *key, void (*destructor)(void *)) {
     if (key == NULL)
         return EINVAL;
 
-    ObtainSemaphore(&tls_sem);
+    MutexObtain(tls_sem);
 
     for (i = 0; i < PTHREAD_KEYS_MAX; i++) {
         if (tlskeys[i].used == FALSE)
             break;
     }
 
     if (i == PTHREAD_KEYS_MAX) {
-        ReleaseSemaphore(&tls_sem);
+        MutexRelease(tls_sem);
         return EAGAIN;
     }
 
     tls = &tlskeys[i];
     tls->used = TRUE;
     tls->destructor = destructor;
 
-    ReleaseSemaphore(&tls_sem);
+    MutexRelease(tls_sem);
 
     *key = i;
 

diff --git a/library/pthread/pthread_key_delete.c b/library/pthread/pthread_key_delete.c
@@ -46,17 +46,17 @@ pthread_key_delete(pthread_key_t key) {
 
     tls = &tlskeys[key];
 
-    ObtainSemaphore(&tls_sem);
+    MutexObtain(tls_sem);
 
     if (tls->used == FALSE) {
-        ReleaseSemaphore(&tls_sem);
+        MutexRelease(tls_sem);
         return EINVAL;
     }
 
     tls->used = FALSE;
     tls->destructor = NULL;
 
-    ReleaseSemaphore(&tls_sem);
+    MutexRelease(tls_sem);
 
     return 0;
 }
diff --git a/library/resolv/lookup.h b/library/resolv/lookup.h
@@ -37,6 +37,7 @@ struct resolvconf {
     struct address ns[MAXNS];
     unsigned nns, attempts, ndots;
     unsigned timeout;
+    int loaded;
 };
 
 /* The limit of 48 results is a non-sharp bound on the number of addresses

diff --git a/library/resolv/lookup_name.c b/library/resolv/lookup_name.c
@@ -187,16 +187,20 @@ static int name_from_dns(struct address buf[static MAXADDRS], char canon[static
 static int
 name_from_dns_search(struct address buf[static MAXADDRS], char canon[static 256], const char *name, int family) {
     char search[256];
-    struct resolvconf conf;
     size_t l, dots;
     char *p, *z;
-    if (__get_resolv_conf(&conf, search, sizeof search) < 0)
-        return -1;
+    struct _clib4 *__clib4 = __CLIB4;
+
+    if (((struct resolvconf *) __clib4->resolv_conf)->loaded == 0) {
+        if (__get_resolv_conf(__clib4->resolv_conf, search, sizeof search) < 0)
+            return -1;
+        ((struct resolvconf *) __clib4->resolv_conf)->loaded = 1;
+    }
 
     /* Count dots, suppress search when >=ndots or name ends in
      * a dot, which is an explicit request for global scope. */
     for (dots = l = 0; name[l]; l++) if (name[l] == '.') dots++;
-    if (dots >= conf.ndots || name[l - 1] == '.') *search = 0;
+    if (dots >= ((struct resolvconf *) __clib4->resolv_conf)->ndots || name[l - 1] == '.') *search = 0;
 
     /* Strip final dot for canon, fail if multiple trailing dots. */
     if (name[l - 1] == '.') l--;
@@ -219,13 +223,13 @@ name_from_dns_search(struct address buf[static MAXADDRS], char canon[static 256]
         if ((size_t) (z - p) < 256 - l - 1) {
             memcpy(canon + l + 1, p, z - p);
             canon[z - p + 1 + l] = 0;
-            int cnt = name_from_dns(buf, canon, canon, family, &conf);
+            int cnt = name_from_dns(buf, canon, canon, family, __clib4->resolv_conf);
             if (cnt) return cnt;
         }
     }
 
     canon[l] = 0;
-    return name_from_dns(buf, canon, name, family, &conf);
+    return name_from_dns(buf, canon, name, family, __clib4->resolv_conf);
 }
 
 static const struct policy {

diff --git a/library/resolv/res_send.c b/library/resolv/res_send.c
@@ -40,10 +40,15 @@
 
 static int
 __res_msend(int nqueries, const unsigned char *const *queries, const int *qlens, unsigned char *const *answers, int *alens, int asize) {
-    struct resolvconf conf;
-    if (__get_resolv_conf(&conf, 0, 0) < 0)
-        return -1;
-    return __res_msend_rc(nqueries, queries, qlens, answers, alens, asize, &conf);
+    struct _clib4 *__clib4 = __CLIB4;
+
+    if (((struct resolvconf *) __clib4->resolv_conf)->loaded == 0) {
+        if (__get_resolv_conf(__clib4->resolv_conf, 0, 0) < 0)
+            return -1;
+        ((struct resolvconf *) __clib4->resolv_conf)->loaded = 1;
+    }
+
+    return __res_msend_rc(nqueries, queries, qlens, answers, alens, asize, __clib4->resolv_conf);
 }
 
 int