Added max_align_t and some backports from Olaf's clib2

Author: afxgroup

GNUmakefile.os4

@@ -358,8 +358,10 @@ compile-tests:
 install:
 	$(DELETE) $(INSTALL_PREFIX)/include/*
 	$(DELETE) $(INSTALL_PREFIX)/lib/*
+	$(DELETE) $(INSTALL_PREFIX)/clib2.library*
 	$(COPY) $(OUTPUT_LIB)/* $(INSTALL_PREFIX)/lib/
 	$(COPY) libs/libauto.a $(INSTALL_PREFIX)/lib/
+	$(COPY) $(BUILD_DIR)/clib2.library* $(INSTALL_PREFIX)
 	$(COPY) $(LIB_ROOT)/library/include/* $(INSTALL_PREFIX)/include/
 
 release:

library/include/stddef.h

@@ -20,6 +20,7 @@ __BEGIN_DECLS
 
 typedef int ptrdiff_t;
 typedef unsigned int size_t;
+typedef struct { long long __ll; long double __ld; } max_align_t;
 
 /* wchar_t is a built-in type in C++ */
 #ifndef __cplusplus

library/posix/raise.c

@@ -1,5 +1,5 @@
 /*
- * $Id: signal_raise.c,v 1.10 2006-01-08 12:04:24 clib2devs Exp $
+ * $Id: signal_raise.c,v 1.11 2023-09-12 12:04:24 clib2devs Exp $
 */
 
 #ifndef _SIGNAL_HEADERS_H
@@ -106,7 +106,7 @@ raise(int sig) {
                     /* Drop straight into abort(), which might call signal()
                        again but is otherwise guaranteed to eventually
                        land us in _exit(). */
-                    abort();
+                    __abort();
                 }
                 /* If we have a SIGALRM without associated handler don't call abort but exit directly */
                 if (sig == SIGALRM) {

library/stdio/fclose.c

@@ -89,6 +89,7 @@ fclose(FILE *stream) {
     if (file->iob_CustomBuffer != NULL) {
         SHOWMSG("Delete allocated buffer");
         FreeVec(file->iob_CustomBuffer);
+        file->iob_CustomBuffer = NULL;
     }
 
     /* Free the lock semaphore now. */

library/stdio/fgets.c

@@ -71,15 +71,16 @@ fgets(char *buf, int n, FILE *stream) {
                 /* Copy the remainder of the read buffer into the
                    string buffer, including the terminating line
                    feed character. */
-                memcpy(s, buffer, num_characters_in_line);
+                memmove(s, buffer, num_characters_in_line - 1);
+                s += num_characters_in_line - 1;
 
                 file->iob_BufferPosition += num_characters_in_line;
                 s[num_characters_in_line] = 0;
                 /* And that concludes the line read operation. */
                 goto out;
             }
 
-            memcpy(s, buffer, num_bytes_in_buffer);
+            memmove(s, buffer, num_bytes_in_buffer);
             s += num_bytes_in_buffer;
 
             file->iob_BufferPosition += num_bytes_in_buffer;

library/stdio/fread.c

@@ -67,7 +67,10 @@ fread(void *ptr, size_t element_size, size_t count, FILE *stream) {
         if (__fgetc_check((FILE *) file) < 0)
             goto out;
 
+        /* Check for overflow. */
         total_size = element_size * count;
+        if (element_size != (total_size / count))
+            goto out;
 
         SHOWVALUE(total_size);
 
@@ -128,11 +131,6 @@ fread(void *ptr, size_t element_size, size_t count, FILE *stream) {
                     total_size -= num_bytes_in_buffer;
                     if (total_size == 0)
                         break;
-
-                    /* If the read buffer is now empty and there is still enough data
-                       to be read, try to optimize the read operation. */
-                    if (file->iob_BufferReadBytes == 0 && total_size >= (size_t) file->iob_BufferSize)
-                        continue;
                 }
 
                 c = __getc(file);

library/stdio/fwrite.c

@@ -55,7 +55,10 @@ fwrite(const void *ptr, size_t element_size, size_t count, FILE *stream) {
         size_t total_bytes_written = 0;
         size_t total_size;
 
+        /* Check for overflow. */
         total_size = element_size * count;
+        if (element_size != (total_size / count))
+            goto out;
 
         /* If this is an unbuffered interactive stream, we will switch
            to line buffered mode in order to improve readability of

library/stdio/gets.c

@@ -61,6 +61,7 @@ gets(char *s) {
                    string buffer, including the terminating line
                    feed character. */
                 memmove(s, buffer, num_characters_in_line);
+                s += num_characters_in_line;
 
                 file->iob_BufferPosition += num_characters_in_line;
                 s[num_characters_in_line] = 0;

library/stdio/setvbuf.c

@@ -77,7 +77,7 @@ setvbuf(FILE *stream, char *buf, int bufmode, size_t size) {
 		   allocate some memory for it. */
         if (size > 0 && buf == NULL) {
             /* Allocate a little more memory than necessary. */
-            new_buffer = malloc(size + (__clib2->__cache_line_size - 1));
+            new_buffer = AllocVecTags(size + (__clib2->__cache_line_size - 1), AVT_Type, MEMF_SHARED, TAG_DONE);
             if (new_buffer == NULL) {
                 __set_errno(ENOBUFS);
                 goto out;

library/stdlib/abort.c

@@ -15,14 +15,10 @@
 #endif /* _STDIO_HEADERS_H */
 
 void
-abort(void) {
+__abort(void) {
     ENTER();
     struct _clib2 *__clib2 = __CLIB2;
 
-    /* Try to call the signal handler that might be in charge of
-       handling cleanup operations, etc. */
-    raise(SIGABRT);
-
     /* If the signal handler returns it means that we still have
        to terminate the program. */
 
@@ -36,3 +32,14 @@ abort(void) {
        does not trigger the exit trap. */
     _exit(EXIT_FAILURE);
 }
+
+void
+abort(void) {
+    /* Try to call the signal handler that might be in charge of
+       handling cleanup operations, etc. */
+    raise(SIGABRT);
+
+    /* If the signal handler returns it means that we still have
+       to terminate the program. */
+    __abort();
+}

library/stdlib/calloc.c

@@ -35,7 +35,7 @@ __calloc(size_t num_elements, size_t element_size) {
         D(("calloc(num_elements=%ld, element_size=%ld) overflow"));
     }
 
-    return (result);
+    return result;
 }
 
 void *
@@ -44,5 +44,5 @@ calloc(size_t num_elements, size_t element_size) {
 
     result = __calloc(num_elements, element_size);
 
-    return (result);
+    return result;
 }

library/stdlib/stdlib_protos.h

@@ -47,6 +47,8 @@ extern void reent_exit(struct _clib2 *__clib2, BOOL fallback);
 extern void __check_abort(void);
 extern int32 _start(STRPTR argstring, int32 arglen, struct ExecBase *sysbase);
 
+extern void __abort(void);
+
 /* stdlib_assertion_failure.c */
 extern void __assertion_failure(const char *file_name, int line_number, const char *expression);
 

test_programs/misc/max_align.c

@@ -0,0 +1,20 @@
+#include <stdio.h>
+#include <stddef.h>
+#include <stdalign.h>
+#include <stdlib.h>
+#include <inttypes.h>
+
+int main(void) {
+    size_t sz = sizeof(max_align_t);
+    printf("Size of max_align_t is %zu (%#zx)\n", sz, sz);
+
+    size_t a = alignof(max_align_t);
+    printf("Alignment of max_align_t is %zu (%#zx)\n", a, a);
+
+    void *p = malloc(123);
+    printf("The address obtained from malloc(123) is %#"
+    PRIxPTR
+    "\n",
+            (uintptr_t) p);
+    free(p);
+}