This commit was manufactured by cvs2svn to create tag 'V1_184'.

git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/tags/V1_184@14778 87f5fb63-7c3d-0410-a384-fd976d0f7a62

library/GNUmakefile.68k

@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.68k,v 1.40 2005-03-11 09:37:27 obarthel Exp $
+# $Id: GNUmakefile.68k,v 1.17 2004-11-18 09:40:37 obarthel Exp $
 #
 # :ts=8
 #
@@ -77,47 +77,40 @@ $(LIBAMIGA_OBJS)/%.o : %.c
 ##############################################################################
 
 ifeq (small_data_020,$(TYPE))
-CODE_TYPE	:= -m68020-60
+CODE_TYPE := -fbaserel -DSMALL_DATA -m68020-60 -DM68020
-CODE_FLAGS	:= -fbaserel -DSMALL_DATA -DM68020
 endif
 
 ifeq (small_data,$(TYPE))
-CODE_TYPE	:= -m68000
+CODE_TYPE := -fbaserel -DSMALL_DATA -m68000
-CODE_FLAGS	:= -fbaserel -DSMALL_DATA
 endif
 
 ifeq (small_data32,$(TYPE))
-CODE_TYPE	:= -m68020-60
+CODE_TYPE := -fbaserel32 -DSMALL_DATA32 -m68020-60 -DM68020
-CODE_FLAGS	:= -fbaserel32 -DSMALL_DATA32 -DM68020
 endif
 
 ifeq (large_data_020,$(TYPE))
-CODE_TYPE	:= -m68020-60
+CODE_TYPE := -m68020-60 -DM68020
-CODE_FLAGS	:= -DM68020
 endif
 
 ifeq (large_data,$(TYPE))
-CODE_TYPE	:= -m68000
+CODE_TYPE := -m68000
-CODE_FLAGS	:=
 endif
 
 ##############################################################################
 
 WARNINGS = \
-	-Wall -W -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
+	-Wall -W -Wshadow -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
-	-Wundef -Wbad-function-cast -Wmissing-declarations -Wunused
+	-Wundef -Wbad-function-cast -Wmissing-declarations -Wconversion
-
-#	-Wconversion -Wshadow
 
 INCLUDES = -Iinclude -I. -Inetinclude
- OPTIONS = -DNDEBUG -fno-builtin
+ OPTIONS = -DNDEBUG -fno-builtin -DNO_INLINE_STDARG
 #OPTIONS = -D__MEM_DEBUG -fno-builtin
 #OPTIONS = -DDEBUG -D__MEM_DEBUG -DNO_INLINE_STDARG -fno-builtin
  OPTIMIZE = -O -fomit-frame-pointer -fstrength-reduce -finline-functions
 #OPTIMIZE = -O2 -fomit-frame-pointer
 #DEBUG = -g2
 
-CFLAGS = $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(CODE_FLAGS) $(CODE_TYPE) $(INCLUDES)
+CFLAGS = $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(CODE_TYPE) $(INCLUDES)
 
 ##############################################################################
 
@@ -135,30 +128,27 @@ C_LIB = \
 	ctype_isspace.o \
 	ctype_isupper.o \
 	ctype_isxdigit.o \
-	ctype_table.o \
 	ctype_tolower.o \
 	ctype_toupper.o \
+	ctype_table.o \
 	dirent_closedir.o \
+	dirent_data.o \
+	dirent_rewinddir.o \
 	dirent_opendir.o \
 	dirent_readdir.o \
-	dirent_rewinddir.o \
 	errno_data.o \
 	fcntl_close.o \
 	fcntl_creat.o \
 	fcntl_fcntl.o \
-	fcntl_get_default_file.o \
-	fcntl_lock.o \
 	fcntl_lseek.o \
 	fcntl_open.o \
 	fcntl_read.o \
 	fcntl_write.o \
-	ftw_ftw.o \
+	fcntl_get_default_file.o \
-	ftw_nftw.o \
 	libgen_basename.o \
 	libgen_dirname.o \
 	locale_init_exit.o \
 	locale_localeconv.o \
-	locale_open_locale.o \
 	locale_setlocale.o \
 	mount_convertinfo.o \
 	mount_fstatfs.o \
@@ -176,6 +166,7 @@ C_LIB = \
 	signal_sigsetmask.o \
 	stat_chmod.o \
 	stat_convertfileinfo.o \
+	stat_data.o \
 	stat_fchmod.o \
 	stat_fstat.o \
 	stat_lstat.o \
@@ -185,22 +176,21 @@ C_LIB = \
 	stat_umask.o \
 	stdio_asprintf.o \
 	stdio_clearerr.o \
+	stdio_data.o \
 	stdio_dropiobreadbuffer.o \
 	stdio_duplicate_fd.o \
-	stdio_examine_fh.o \
 	stdio_fclose.o \
 	stdio_fdhookentry.o \
 	stdio_feof.o \
 	stdio_ferror.o \
 	stdio_fflush.o \
+	stdio_flush.o \
 	stdio_fgetc.o \
 	stdio_fgetpos.o \
 	stdio_fgets.o \
 	stdio_filliobreadbuffer.o \
 	stdio_findvacantfdentry.o \
 	stdio_findvacantiobentry.o \
-	stdio_flockfile.o \
-	stdio_flush.o \
 	stdio_flushiobwritebuffer.o \
 	stdio_fopen.o \
 	stdio_fprintf.o \
@@ -212,38 +202,27 @@ C_LIB = \
 	stdio_fseek.o \
 	stdio_fsetpos.o \
 	stdio_ftell.o \
-	stdio_ftrylockfile.o \
-	stdio_funlockfile.o \
 	stdio_fwrite.o \
 	stdio_getc.o \
-	stdio_getc_unlocked.o \
 	stdio_getchar.o \
-	stdio_getchar_unlocked.o \
-	stdio_gets.o \
 	stdio_get_file_descriptor.o \
+	stdio_gets.o \
 	stdio_growfdtable.o \
 	stdio_growiobtable.o \
-	stdio_grow_file.o \
 	stdio_initializefd.o \
 	stdio_initializeiob.o \
 	stdio_init_exit.o \
-	stdio_file_init.o \
 	stdio_iobhookentry.o \
-	stdio_lock.o \
 	stdio_locksemaphorename.o \
 	stdio_nostdio.o \
 	stdio_openiob.o \
-	stdio_parent_of_fh.o \
 	stdio_perror.o \
 	stdio_popen.o \
 	stdio_printf.o \
 	stdio_putc.o \
-	stdio_putc_unlocked.o \
 	stdio_putchar.o \
-	stdio_putchar_unlocked.o \
 	stdio_puts.o \
 	stdio_remove.o \
-	stdio_remove_fd_alias.o \
 	stdio_rename.o \
 	stdio_rewind.o \
 	stdio_scanf.o \
@@ -257,7 +236,6 @@ C_LIB = \
 	stdio_tmpnam.o \
 	stdio_translateioerror.o \
 	stdio_ungetc.o \
-	stdio_unlockfile.o \
 	stdio_vasprintf.o \
 	stdio_vasprintf_hook_entry.o \
 	stdio_vfprintf.o \
@@ -274,12 +252,13 @@ C_LIB = \
 	stdlib_atexit.o \
 	stdlib_atoi.o \
 	stdlib_atol.o \
-	stdlib_atoll.o \
 	stdlib_bsearch.o \
 	stdlib_calloc.o \
 	stdlib_checkdetach.o \
 	stdlib_constructor.o \
 	stdlib_constructor_begin.o \
+	stdlib_constructor_end.o \
+	stdlib_data.o \
 	stdlib_default_pool_size.o \
 	stdlib_default_puddle_size.o \
 	stdlib_destructor.o \
@@ -294,7 +273,6 @@ C_LIB = \
 	stdlib_getdefstacksize.o \
 	stdlib_getenv.o \
 	stdlib_getsp.o \
-	stdlib_get_errno.o \
 	stdlib_init_exit.o \
 	stdlib_isresident.o \
 	stdlib_labs.o \
@@ -315,14 +293,10 @@ C_LIB = \
 	stdlib_putenv.o \
 	stdlib_qsort.o \
 	stdlib_rand.o \
-	stdlib_rand_r.o \
 	stdlib_realloc.o \
 	stdlib_red_black.o \
-	stdlib_semaphore.o \
 	stdlib_setenv.o \
 	stdlib_setjmp.o \
-	stdlib_set_errno.o \
-	stdlib_set_process_window.o \
 	stdlib_shell_escape.o \
 	stdlib_showerror.o \
 	stdlib_socket.o \
@@ -333,11 +307,10 @@ C_LIB = \
 	stdlib_stacksafezone.o \
 	stdlib_stacksize.o \
 	stdlib_stack_usage.o \
-	stdlib_arg.o \
+	stdlib_startup.o \
-	stdlib_stdio_window_spec.o \
 	stdlib_strtol.o \
-	stdlib_strtoll.o \
 	stdlib_strtoul.o \
+	stdlib_strtoll.o \
 	stdlib_strtoull.o \
 	stdlib_swapstack.o \
 	stdlib_sysbase.o \
@@ -349,7 +322,7 @@ C_LIB = \
 	stdlib_umodsi3.o \
 	stdlib_unsetenv.o \
 	stdlib_wildcard_expand.o \
-	strings_ffs.o \
+	stdlib_stdio_window_spec.o \
 	strings_strcasecmp.o \
 	strings_strncasecmp.o \
 	string_bcmp.o \
@@ -387,12 +360,9 @@ C_LIB = \
 	time_asctime_r.o \
 	time_clock.o \
 	time_converttime.o \
-	time_convert_datestamp.o \
-	time_convert_time.o \
 	time_ctime.o \
 	time_ctime_r.o \
 	time_data.o \
-	time_days_per_date.o \
 	time_gettimeofday.o \
 	time_gmtime.o \
 	time_gmtime_r.o \
@@ -402,7 +372,6 @@ C_LIB = \
 	time_numbertostring.o \
 	time_strftime.o \
 	time_time.o \
-	time_weekday.o \
 	unistd_access.o \
 	unistd_chdir.o \
 	unistd_chdir_exit.o \
@@ -411,10 +380,8 @@ C_LIB = \
 	unistd_dup.o \
 	unistd_dup2.o \
 	unistd_fchown.o \
-	unistd_fdatasync.o \
 	unistd_fdopen.o \
 	unistd_fileno.o \
-	unistd_fsync.o \
 	unistd_ftruncate.o \
 	unistd_getcwd.o \
 	unistd_getopt.o \
@@ -427,18 +394,17 @@ C_LIB = \
 	unistd_realpath.o \
 	unistd_sleep.o \
 	unistd_symlink.o \
-	unistd_sync_fd.o \
 	unistd_timer.o \
 	unistd_time_delay.o \
 	unistd_truncate.o \
 	unistd_unlink.o \
 	unistd_usleep.o \
-	utime_utime.o \
+	utime_utime.o
-	utsname_uname.o
 
 UNIX_LIB = \
 	unix.lib_rev.o \
 	dirent_closedir.o \
+	dirent_data.o \
 	dirent_rewinddir.o \
 	dirent_opendir.o \
 	dirent_readdir.o \
@@ -457,16 +423,16 @@ UNIX_LIB = \
 	stdio_fdhookentry.o \
 	stdio_fflush.o \
 	stdio_fopen.o \
+	stdio_fopen.o \
 	stdio_init_exit.o \
-	stdio_file_init.o \
 	stdio_locksemaphorename.o \
 	stdio_openiob.o \
 	stdio_popen.o \
-	stdio_record_locking.o \
 	stdio_remove.o \
 	stdio_rename.o \
 	stdlib_mkdtemp.o \
 	stdlib_mkstemp.o \
+	stdlib_mkstemp.o \
 	stdlib_mktemp.o \
 	stdlib_system.o \
 	unistd_access.o \
@@ -498,12 +464,12 @@ MATH_LIB = \
 	math_ceil.o \
 	math_cos.o \
 	math_cosh.o \
+	math_data.o \
 	math_exp.o \
 	math_fabs.o \
 	math_floor.o \
 	math_fmod.o \
 	math_frexp.o \
-	math_huge_val.o \
 	math_hypot.o \
 	math_init_exit.o \
 	math_isinf.o \
@@ -537,12 +503,12 @@ MATH_LIB = \
 	stdio_vsnprintf.o \
 	stdio_vsprintf.o \
 	stdlib_atof.o \
+	stdlib_machine_test.o \
 	stdlib_strtod.o \
 	time_difftime.o
 
 MATH_LIB_881 = \
 	m881.lib_rev.o \
-	stdlib_machine_test.o \
 	$(MATH_LIB)
 
 MATH_LIB_IEEE = \
@@ -592,6 +558,7 @@ NET_LIB = \
 	socket_accept.o \
 	socket_bind.o \
 	socket_connect.o \
+	socket_data.o \
 	socket_gethostbyaddr.o \
 	socket_gethostbyname.o \
 	socket_gethostid.o \
@@ -658,8 +625,7 @@ NET_LIB = \
 	usergroup_setregid.o \
 	usergroup_setreuid.o \
 	usergroup_setsid.o \
-	usergroup_setuid.o \
+	usergroup_setuid.o
-	utsname_uname.o
 
 DEBUG_LIB = \
 	debug.lib_rev.o \
@@ -728,17 +694,6 @@ AMIGA_LIB = \
 	amiga_timedelay.o \
 	amiga_waitbeam.o
 
-MEMDEBUG_LIB = \
-	stdio_vasprintf_debug.o \
-	stdio_vasprintf_debug.o \
-	stdio_vasprintf_hook_entry_debug.o \
-	stdlib_alloca_debug.o \
-	stdlib_calloc_debug.o \
-	stdlib_free_debug.o \
-	stdlib_malloc_debug.o \
-	string_strdup_debug.o \
-	unistd_getcwd_debug.o
-
 ##############################################################################
 
 LIBS_68K := $(LIBC_OBJS)/libc.a $(LIBSTACK_OBJS)/libstack.a $(LIBUNIX_OBJS)/libunix.a \
@@ -749,7 +704,7 @@ LIBS_020 := $(LIBM881_OBJS)/libm881.a $(LIBS_68K)
 ##############################################################################
 
 # The 881 math library won't build in plain 68k mode
-ifneq (,$(findstring 68020,$(CODE_FLAGS)))
+ifneq (,$(findstring 68020,$(CODE_TYPE)))
 LIBS := $(LIBS_020)
 else
 LIBS := $(LIBS_68K)
@@ -846,47 +801,47 @@ lib/libm020 : lib
 
 lib/libb/libm020/libm.a: lib lib/libb/libm020
 	$(MAKE) TYPE=small_data_020 kitchen_sink
-	@$(COPY) $(foreach file,$(LIBS_020),small_data_020/$(file)) lib/libb/libm020
+	$(COPY) $(foreach file,$(LIBS_020),small_data_020/$(file)) lib/libb/libm020
 
 lib/libb/libm.a: lib lib/libb
 	$(MAKE) TYPE=small_data kitchen_sink
-	@$(COPY) $(foreach file,$(LIBS_68K),small_data/$(file)) lib/libb
+	$(COPY) $(foreach file,$(LIBS_68K),small_data/$(file)) lib/libb
 
 lib/libb32/libm020/libm.a: lib lib/libb32 lib/libb32/libm020
 	$(MAKE) TYPE=small_data32 kitchen_sink
-	@$(COPY) $(foreach file,$(LIBS_020),small_data32/$(file)) lib/libb32/libm020
+	$(COPY) $(foreach file,$(LIBS_020),small_data32/$(file)) lib/libb32/libm020
 
 lib/libm020/libm.a: lib lib/libm020
 	$(MAKE) TYPE=large_data_020 kitchen_sink
-	@$(COPY) $(foreach file,$(LIBS_020),large_data_020/$(file)) lib/libm020
+	$(COPY) $(foreach file,$(LIBS_020),large_data_020/$(file)) lib/libm020
 
 lib/libm.a: lib
 	$(MAKE) TYPE=large_data kitchen_sink
-	@$(COPY) $(foreach file,$(LIBS_68K),large_data/$(file)) lib
+	$(COPY) $(foreach file,$(LIBS_68K),large_data/$(file)) lib
 
 lib/nrcrt0.o : lib nrcrt0.o
-	@$(COPY) nrcrt0.o lib
+	$(COPY) nrcrt0.o lib
 
 lib/nbcrt0.o : lib nbcrt0.o
-	@$(COPY) nbcrt0.o lib
+	$(COPY) nbcrt0.o lib
 
 lib/ncrt0.o : lib ncrt0.o
-	@$(COPY) ncrt0.o lib
+	$(COPY) ncrt0.o lib
 
 lib/n32bcrt0.o : lib nb32crt0.o
-	@$(COPY) nb32crt0.o lib
+	$(COPY) nb32crt0.o lib
 
 lib/n32rcrt0.o : lib nr32crt0.o
-	@$(COPY) nr32crt0.o lib
+	$(COPY) nr32crt0.o lib
 
 lib/mainnb.o : lib mainnb.o
-	@$(COPY) mainnb.o lib
+	$(COPY) mainnb.o lib
 
 lib/mainb.o : lib mainb.o
-	@$(COPY) mainb.o lib
+	$(COPY) mainb.o lib
 
 lib/mainb32.o : lib mainb32.o
-	@$(COPY) mainb32.o lib
+	$(COPY) mainb32.o lib
 
 ##############################################################################
 
@@ -940,73 +895,6 @@ $(LIBC_OBJS)/stdlib_red_black.o : stdlib_red_black.c stdlib_mem_debug.h
 
 ##############################################################################
 
-# The -fbaserel32 option requires the CPU type to be 68010/68020, too.
-ifneq (,$(findstring fbaserel32,$(CODE_FLAGS)))
-LOCAL_CODE_FLAGS := $(CODE_FLAGS) $(CODE_TYPE)
-else
-LOCAL_CODE_FLAGS := $(CODE_FLAGS)
-endif
-
-$(LIBC_OBJS)/stdlib_machine_test.o : stdlib_machine_test.c
-	@echo "Compiling $< [$(TYPE):c]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_machine_test.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) $<
-
-$(LIBM881_OBJS)/stdlib_machine_test.o : stdlib_machine_test.c
-	@echo "Compiling $< [$(TYPE):c]"
-	@$(CC) -o $(LIBM881_OBJS)/stdlib_machine_test.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) -DM68881_FLOATING_POINT_SUPPORT $<
-
-$(LIBC_OBJS)/stdlib_showerror.o : stdlib_showerror.c
-	@echo "Compiling $< [$(TYPE):c]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_showerror.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) $<
-
-##############################################################################
-
-$(LIBC_OBJS)/stdlib_alloca_debug.o : stdlib_alloca.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_alloca_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_alloca.c
-
-$(LIBC_OBJS)/stdlib_calloc_debug.o : stdlib_calloc.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_calloc_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_calloc.c
-
-$(LIBC_OBJS)/stdlib_free_debug.o : stdlib_free.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_free_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_free.c
-
-$(LIBC_OBJS)/stdlib_malloc_debug.o : stdlib_malloc.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_malloc_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_malloc.c
-
-$(LIBC_OBJS)/stdlib_realloc_debug.o : stdlib_realloc.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_realloc_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_realloc.c
-
-$(LIBC_OBJS)/stdio_vasprintf_hook_entry_debug.o : stdio_vasprintf_hook_entry.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdio_vasprintf_hook_entry_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdio_vasprintf_hook_entry.c
-
-$(LIBC_OBJS)/stdio_vasprintf_debug.o : stdio_vasprintf.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdio_vasprintf_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdio_vasprintf.c
-
-$(LIBM_OBJS)/stdio_vasprintf_debug.o : stdio_vasprintf.c
-	@echo "Compiling $< [$(TYPE):m debug]"
-	@$(CC) -o $(LIBM_OBJS)/stdio_vasprintf_debug.o -c $(CFLAGS) -DIEEE_FLOATING_POINT_SUPPORT -D__USE_MEM_TREES -D__MEM_DEBUG stdio_vasprintf.c
-
-$(LIBC_OBJS)/string_strdup_debug.o : string_strdup.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/string_strdup_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG string_strdup.c
-
-$(LIBC_OBJS)/unistd_getcwd_debug.o : unistd_getcwd.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/unistd_getcwd_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG unistd_getcwd.c
-
-$(LIBUNIX_OBJS)/unistd_getcwd_debug.o : unistd_getcwd.c
-	@echo "Compiling $< [$(TYPE):unix debug]"
-	@$(CC) -o $(LIBUNIX_OBJS)/unistd_getcwd_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG -DUNIX_PATH_SEMANTICS unistd_getcwd.c
-
-##############################################################################
-
 $(LIBC_OBJS) :
 	$(MAKEDIR) $@
 
@@ -1088,56 +976,25 @@ $(LIBAMIGA_OBJS)/libamiga.a : $(LIBAMIGA_OBJS) $(foreach file,$(AMIGA_LIB),$(LIB
 ##############################################################################
 
 nrcrt0.o : nrcrt0.S
-	@echo "Assembling $< [resident]"
+	$(CC) -traditional -o $@ -c nrcrt0.S
-	@$(CC) -traditional -o $@ -c nrcrt0.S
 
 nr32crt0.o : nrcrt0.S
-	@echo "Assembling $< [resident32]"
+	$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c nrcrt0.S
-	@$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c nrcrt0.S
 
 nbcrt0.o : ncrt0.S
-	@echo "Assembling $< [small_data]"
+	$(CC) -traditional -DSMALL_DATA -o $@ -c ncrt0.S
-	@$(CC) -traditional -DSMALL_DATA -o $@ -c ncrt0.S
 
 nb32crt0.o : ncrt0.S
-	@echo "Assembling $< [small_data32]"
+	$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c ncrt0.S
-	@$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c ncrt0.S
 
 ncrt0.o : ncrt0.S
-	@echo "Assembling $< [large_data]"
+	$(CC) -traditional -o $@ -c ncrt0.S
-	@$(CC) -traditional -o $@ -c ncrt0.S
 
 mainb32.o : stdlib_main.c
-	@echo "Compiling $< [small_data32]"
+	$(CC) -o mainb32.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -fbaserel32 -DSMALL_DATA32 -m68020-60 -DM68020 stdlib_main.c
-	@$(CC) -o mainb32.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -fbaserel32 -DSMALL_DATA32 -m68020-60 -DM68020 stdlib_main.c
 
 mainb.o : stdlib_main.c
-	@echo "Compiling $< [small_data]"
+	$(CC) -o mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -fbaserel -DSMALL_DATA -m68000 stdlib_main.c
-	@$(CC) -o mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -fbaserel -DSMALL_DATA -m68000 stdlib_main.c
 
 mainnb.o : stdlib_main.c
-	@echo "Compiling $< [large_data]"
+	$(CC) -o mainnb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -m68000 stdlib_main.c
-	@$(CC) -o mainnb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -m68000 stdlib_main.c
-
-##############################################################################
-
-CONSTRUCTOR_FILES = \
-	amiga_rexxvars.c  \
-	dirent_closedir.c \
-	locale_init_exit.c \
-	math_init_exit.c \
-	socket_init_exit.c \
-	stdio_file_init.c \
-	stdio_init_exit.c \
-	stdlib_alloca.c \
-	stdlib_setenv.c \
-	stdlib_stackextension.c \
-	time_clock.c \
-	unistd_chdir_exit.c \
-	unistd_init_exit.c \
-	unistd_timer.c \
-	unistd_wildcard_expand.c \
-	usergroup_init_exit.c
-
-touch_constructor_files:
-	touch $(CONSTRUCTOR_FILES)

library/GNUmakefile.os4

@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.os4,v 1.41 2005-03-11 09:37:28 obarthel Exp $
+# $Id: GNUmakefile.os4,v 1.15 2004-11-18 09:40:37 obarthel Exp $
 #
 # :ts=8
 #
@@ -15,7 +15,7 @@ NET_INCLUDE = netinclude
 CC = ppc-amigaos-gcc
 AR = ppc-amigaos-ar -q
 RANLIB = ppc-amigaos-ranlib
-COPY = cp -a
+COPY = cp
 DELETE = rm -r
 MAKEDIR = mkdir
 
@@ -32,19 +32,19 @@ MAKE = make -f GNUmakefile.os4
 ##############################################################################
 
 ifeq (,$(TYPE))
-LIBC_OBJS		= libc_objs
+LIBC_OBJS	= libc_objs
-LIBUNIX_OBJS		= libunix_objs
+LIBUNIX_OBJS	= libunix_objs
-LIBM_OBJS		= libm_objs
+LIBM_OBJS	= libm_objs
-LIBNET_OBJS		= libnet_objs
+LIBNET_OBJS	= libnet_objs
-LIBDEBUG_OBJS		= libdebug_objs
+LIBDEBUG_OBJS	= libdebug_objs
-LIBAMIGA_OBJS		= libamiga_objs
+LIBAMIGA_OBJS	= libamiga_objs
 else
-LIBC_OBJS		= $(TYPE)/libc_objs
+LIBC_OBJS	= $(TYPE)/libc_objs
-LIBUNIX_OBJS		= $(TYPE)/libunix_objs
+LIBUNIX_OBJS	= $(TYPE)/libunix_objs
-LIBM_OBJS		= $(TYPE)/libm_objs
+LIBM_OBJS	= $(TYPE)/libm_objs
-LIBNET_OBJS		= $(TYPE)/libnet_objs
+LIBNET_OBJS	= $(TYPE)/libnet_objs
-LIBDEBUG_OBJS		= $(TYPE)/libdebug_objs
+LIBDEBUG_OBJS	= $(TYPE)/libdebug_objs
-LIBAMIGA_OBJS		= $(TYPE)/libamiga_objs
+LIBAMIGA_OBJS	= $(TYPE)/libamiga_objs
 endif
 
 ##############################################################################
@@ -96,22 +96,14 @@ CODE_TYPE := -msdata=data -msoft-float
 FLOAT_TYPE :=
 endif
 
-ifeq (baserel,$(TYPE))
-CODE_TYPE := -mbaserel -DBASEREL_DATA
-FLOAT_TYPE := -DPPC_FLOATING_POINT_SUPPORT
-endif
-
-
 ##############################################################################
 
 WARNINGS = \
-	-Wall -W -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
+	-Wall -W -Wshadow -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
-	-Wundef -Wbad-function-cast -Wmissing-declarations -Wunused
+	-Wundef -Wbad-function-cast -Wmissing-declarations -Wconversion
-
-#	-Wconversion -Wshadow
 
 INCLUDES = -Iinclude -I. -I$(SDK_INCLUDE)
-OPTIONS = -D__THREAD_SAFE -DNDEBUG -DUSE_64_BIT_INTS -D__USE_INLINE__ -Wa,-mregnames
+OPTIONS = -DNDEBUG -DUSE_64_BIT_INTS -D__USE_INLINE__ -Wa,-mregnames
 OPTIMIZE = -O -fomit-frame-pointer -funroll-loops
 #DEBUG = -g
 
@@ -134,30 +126,27 @@ C_LIB = \
 	ctype_isspace.o \
 	ctype_isupper.o \
 	ctype_isxdigit.o \
-	ctype_table.o \
 	ctype_tolower.o \
 	ctype_toupper.o \
+	ctype_table.o \
 	dirent_closedir.o \
+	dirent_data.o \
+	dirent_rewinddir.o \
 	dirent_opendir.o \
 	dirent_readdir.o \
-	dirent_rewinddir.o \
 	errno_data.o \
 	fcntl_close.o \
 	fcntl_creat.o \
 	fcntl_fcntl.o \
-	fcntl_get_default_file.o \
-	fcntl_lock.o \
 	fcntl_lseek.o \
 	fcntl_open.o \
 	fcntl_read.o \
 	fcntl_write.o \
-	ftw_ftw.o \
+	fcntl_get_default_file.o \
-	ftw_nftw.o \
 	libgen_basename.o \
 	libgen_dirname.o \
 	locale_init_exit.o \
 	locale_localeconv.o \
-	locale_open_locale.o \
 	locale_setlocale.o \
 	mount_convertinfo.o \
 	mount_fstatfs.o \
@@ -175,6 +164,7 @@ C_LIB = \
 	signal_sigsetmask.o \
 	stat_chmod.o \
 	stat_convertfileinfo.o \
+	stat_data.o \
 	stat_fchmod.o \
 	stat_fstat.o \
 	stat_lstat.o \
@@ -184,22 +174,21 @@ C_LIB = \
 	stat_umask.o \
 	stdio_asprintf.o \
 	stdio_clearerr.o \
+	stdio_data.o \
 	stdio_dropiobreadbuffer.o \
 	stdio_duplicate_fd.o \
-	stdio_examine_fh.o \
 	stdio_fclose.o \
 	stdio_fdhookentry.o \
 	stdio_feof.o \
 	stdio_ferror.o \
 	stdio_fflush.o \
+	stdio_flush.o \
 	stdio_fgetc.o \
 	stdio_fgetpos.o \
 	stdio_fgets.o \
 	stdio_filliobreadbuffer.o \
 	stdio_findvacantfdentry.o \
 	stdio_findvacantiobentry.o \
-	stdio_flockfile.o \
-	stdio_flush.o \
 	stdio_flushiobwritebuffer.o \
 	stdio_fopen.o \
 	stdio_fprintf.o \
@@ -211,38 +200,27 @@ C_LIB = \
 	stdio_fseek.o \
 	stdio_fsetpos.o \
 	stdio_ftell.o \
-	stdio_ftrylockfile.o \
-	stdio_funlockfile.o \
 	stdio_fwrite.o \
 	stdio_getc.o \
-	stdio_getc_unlocked.o \
 	stdio_getchar.o \
-	stdio_getchar_unlocked.o \
-	stdio_gets.o \
 	stdio_get_file_descriptor.o \
+	stdio_gets.o \
 	stdio_growfdtable.o \
 	stdio_growiobtable.o \
-	stdio_grow_file.o \
 	stdio_initializefd.o \
 	stdio_initializeiob.o \
 	stdio_init_exit.o \
-	stdio_file_init.o \
 	stdio_iobhookentry.o \
-	stdio_lock.o \
 	stdio_locksemaphorename.o \
 	stdio_nostdio.o \
 	stdio_openiob.o \
-	stdio_parent_of_fh.o \
 	stdio_perror.o \
 	stdio_popen.o \
 	stdio_printf.o \
 	stdio_putc.o \
-	stdio_putc_unlocked.o \
 	stdio_putchar.o \
-	stdio_putchar_unlocked.o \
 	stdio_puts.o \
 	stdio_remove.o \
-	stdio_remove_fd_alias.o \
 	stdio_rename.o \
 	stdio_rewind.o \
 	stdio_scanf.o \
@@ -256,7 +234,6 @@ C_LIB = \
 	stdio_tmpnam.o \
 	stdio_translateioerror.o \
 	stdio_ungetc.o \
-	stdio_unlockfile.o \
 	stdio_vasprintf.o \
 	stdio_vasprintf_hook_entry.o \
 	stdio_vfprintf.o \
@@ -273,12 +250,13 @@ C_LIB = \
 	stdlib_atexit.o \
 	stdlib_atoi.o \
 	stdlib_atol.o \
-	stdlib_atoll.o \
 	stdlib_bsearch.o \
 	stdlib_calloc.o \
 	stdlib_checkdetach.o \
 	stdlib_constructor.o \
 	stdlib_constructor_begin.o \
+	stdlib_constructor_end.o \
+	stdlib_data.o \
 	stdlib_default_pool_size.o \
 	stdlib_default_puddle_size.o \
 	stdlib_destructor.o \
@@ -293,7 +271,6 @@ C_LIB = \
 	stdlib_getdefstacksize.o \
 	stdlib_getenv.o \
 	stdlib_getsp.o \
-	stdlib_get_errno.o \
 	stdlib_init_exit.o \
 	stdlib_isresident.o \
 	stdlib_labs.o \
@@ -314,14 +291,10 @@ C_LIB = \
 	stdlib_putenv.o \
 	stdlib_qsort.o \
 	stdlib_rand.o \
-	stdlib_rand_r.o \
 	stdlib_realloc.o \
 	stdlib_red_black.o \
-	stdlib_semaphore.o \
 	stdlib_setenv.o \
 	stdlib_setjmp.o \
-	stdlib_set_errno.o \
-	stdlib_set_process_window.o \
 	stdlib_shell_escape.o \
 	stdlib_showerror.o \
 	stdlib_socket.o \
@@ -332,11 +305,10 @@ C_LIB = \
 	stdlib_stacksafezone.o \
 	stdlib_stacksize.o \
 	stdlib_stack_usage.o \
-	stdlib_arg.o \
+	stdlib_startup.o \
-	stdlib_stdio_window_spec.o \
 	stdlib_strtol.o \
-	stdlib_strtoll.o \
 	stdlib_strtoul.o \
+	stdlib_strtoll.o \
 	stdlib_strtoull.o \
 	stdlib_swapstack.o \
 	stdlib_sysbase.o \
@@ -348,7 +320,7 @@ C_LIB = \
 	stdlib_umodsi3.o \
 	stdlib_unsetenv.o \
 	stdlib_wildcard_expand.o \
-	strings_ffs.o \
+	stdlib_stdio_window_spec.o \
 	strings_strcasecmp.o \
 	strings_strncasecmp.o \
 	string_bcmp.o \
@@ -386,12 +358,9 @@ C_LIB = \
 	time_asctime_r.o \
 	time_clock.o \
 	time_converttime.o \
-	time_convert_datestamp.o \
-	time_convert_time.o \
 	time_ctime.o \
 	time_ctime_r.o \
 	time_data.o \
-	time_days_per_date.o \
 	time_gettimeofday.o \
 	time_gmtime.o \
 	time_gmtime_r.o \
@@ -401,7 +370,6 @@ C_LIB = \
 	time_numbertostring.o \
 	time_strftime.o \
 	time_time.o \
-	time_weekday.o \
 	unistd_access.o \
 	unistd_chdir.o \
 	unistd_chdir_exit.o \
@@ -410,10 +378,8 @@ C_LIB = \
 	unistd_dup.o \
 	unistd_dup2.o \
 	unistd_fchown.o \
-	unistd_fdatasync.o \
 	unistd_fdopen.o \
 	unistd_fileno.o \
-	unistd_fsync.o \
 	unistd_ftruncate.o \
 	unistd_getcwd.o \
 	unistd_getopt.o \
@@ -426,19 +392,18 @@ C_LIB = \
 	unistd_realpath.o \
 	unistd_sleep.o \
 	unistd_symlink.o \
-	unistd_sync_fd.o \
 	unistd_timer.o \
 	unistd_time_delay.o \
 	unistd_truncate.o \
 	unistd_unlink.o \
 	unistd_usleep.o \
-	utime_utime.o \
+	utime_utime.o
-	utsname_uname.o
 
 # All objects files which make up libunix.a
 UNIX_LIB = \
 	unix.lib_rev.o \
 	dirent_closedir.o \
+	dirent_data.o \
 	dirent_rewinddir.o \
 	dirent_opendir.o \
 	dirent_readdir.o \
@@ -457,16 +422,16 @@ UNIX_LIB = \
 	stdio_fdhookentry.o \
 	stdio_fflush.o \
 	stdio_fopen.o \
-	stdio_file_init.o \
+	stdio_fopen.o \
 	stdio_init_exit.o \
 	stdio_locksemaphorename.o \
 	stdio_openiob.o \
 	stdio_popen.o \
-	stdio_record_locking.o \
 	stdio_remove.o \
 	stdio_rename.o \
 	stdlib_mkdtemp.o \
 	stdlib_mkstemp.o \
+	stdlib_mkstemp.o \
 	stdlib_mktemp.o \
 	stdlib_system.o \
 	unistd_access.o \
@@ -499,12 +464,12 @@ MATH_LIB = \
 	math_ceil.o \
 	math_cos.o \
 	math_cosh.o \
+	math_data.o \
 	math_exp.o \
 	math_fabs.o \
 	math_floor.o \
 	math_fmod.o \
 	math_frexp.o \
-	math_huge_val.o \
 	math_hypot.o \
 	math_init_exit.o \
 	math_isnan.o \
@@ -554,6 +519,7 @@ NET_LIB = \
 	socket_accept.o \
 	socket_bind.o \
 	socket_connect.o \
+	socket_data.o \
 	socket_gethostbyaddr.o \
 	socket_gethostbyname.o \
 	socket_gethostid.o \
@@ -620,8 +586,7 @@ NET_LIB = \
 	usergroup_setregid.o \
 	usergroup_setreuid.o \
 	usergroup_setsid.o \
-	usergroup_setuid.o \
+	usergroup_setuid.o
-	utsname_uname.o
 
 # All objects files which make up libdebug.a
 DEBUG_LIB = \
@@ -688,17 +653,7 @@ AMIGA_LIB = \
 	amiga_rexxvars.o \
 	amiga_setsuperattrs.o \
 	amiga_timedelay.o \
-	amiga_waitbeam.o
+	amiga_waitbeam.o 
-
-MEMDEBUG_LIB = \
-	stdio_vasprintf_debug.o \
-	stdio_vasprintf_hook_entry_debug.o \
-	stdlib_alloca_debug.o \
-	stdlib_calloc_debug.o \
-	stdlib_free_debug.o \
-	stdlib_malloc_debug.o \
-	string_strdup_debug.o \
-	unistd_getcwd_debug.o
 
 ##############################################################################
 
@@ -724,11 +679,9 @@ all: \
 	lib \
 	lib/soft-float \
 	lib/small-data \
-	lib/baserel \
 	small_data \
 	large_data \
 	large_data_softfloat \
-	baserel \
 	lib/bcrt0.o \
 	lib/bcrtbegin.o \
 	lib/bcrtend.o \
@@ -739,19 +692,13 @@ all: \
 	lib/mainnb.o \
 	lib/libm.a \
 	lib/small-data/libm.a \
-	lib/soft-float/libm.a \
+	lib/soft-float/libm.a
-	lib/baserel/crt0.o \
-	lib/baserel/crtbegin.o \
-	lib/baserel/crtend.o \
-	lib/baserel/mainb.o \
-	lib/baserel/mainnb.o \
-	lib/baserel/libm.a
 
 ##############################################################################
 
 # Delete all object files and libraries
 clean:
-	-$(DELETE) $(STARTUPS) lib small_data large_data large_data_softfloat baserel
+	-$(DELETE) $(STARTUPS) lib small_data large_data large_data_softfloat
 
 ##############################################################################
 
@@ -799,9 +746,6 @@ lib/small-data: lib
 lib/soft-float: lib
 	-$(MAKEDIR) $@
 
-lib/baserel: lib
-	-$(MAKEDIR) $@
-
 small_data:
 	-$(MAKEDIR) $@
 
@@ -811,9 +755,6 @@ large_data:
 large_data_softfloat:
 	-$(MAKEDIR) $@
 
-baserel:
-	-$(MAKEDIR) $@
-
 ##############################################################################
 
 # Dependencies for libm.a (large data variant with hardware floating point code
@@ -848,16 +789,6 @@ small_data/libm.a:
 
 ##############################################################################
 
-# Dependencies for libm.a (baserel variant)
-
-lib/baserel/libm.a: baserel baserel/libm.a
-
-baserel/libm.a:
-	$(MAKE) TYPE=baserel all_libraries
-	$(COPY) $(foreach file,$(LIBS),baserel/$(file)) lib/baserel
-
-##############################################################################
-
 # Rules to build and move the startup code
 lib/crt0.o : lib crt0.o
 	$(COPY) crt0.o lib
@@ -883,22 +814,6 @@ lib/bcrtbegin.o : lib bcrtbegin.o
 lib/bcrtend.o : lib bcrtend.o
 	$(COPY) bcrtend.o lib
 
-lib/baserel/crt0.o : lib baserel/crt0.o
-	$(COPY) baserel/crt0.o lib/baserel
-
-lib/baserel/crtbegin.o : lib baserel/crtbegin.o
-	$(COPY) baserel/crtbegin.o lib/baserel
-
-lib/baserel/crtend.o : lib baserel/crtend.o
-	$(COPY) baserel/crtend.o lib/baserel
-
-lib/baserel/mainnb.o : lib baserel/mainnb.o
-	$(COPY) baserel/mainnb.o lib/baserel
-
-lib/baserel/mainb.o : lib baserel/mainb.o
-	$(COPY) baserel/mainb.o lib/baserel
-
-
 ##############################################################################
 
 # Individual dependencies which tell make to build the object files from
@@ -946,54 +861,6 @@ $(LIBC_OBJS)/stdlib_red_black.o : stdlib_red_black.c stdlib_mem_debug.h
 
 ##############################################################################
 
-# Peculiar build rules for the debug versions of memory allocation functions,
-# or at least those which use memory allocation functionality.
-$(LIBC_OBJS)/stdlib_alloca_debug.o : stdlib_alloca.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_alloca_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_alloca.c
-
-$(LIBC_OBJS)/stdlib_calloc_debug.o : stdlib_calloc.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_calloc_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_calloc.c
-
-$(LIBC_OBJS)/stdlib_free_debug.o : stdlib_free.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_free_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_free.c
-
-$(LIBC_OBJS)/stdlib_malloc_debug.o : stdlib_malloc.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_malloc_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_malloc.c
-
-$(LIBC_OBJS)/stdlib_realloc_debug.o : stdlib_realloc.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_realloc_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_realloc.c
-
-$(LIBC_OBJS)/stdio_vasprintf_hook_entry_debug.o : stdio_vasprintf_hook_entry.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdio_vasprintf_hook_entry_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdio_vasprintf_hook_entry.c
-
-$(LIBC_OBJS)/stdio_vasprintf_debug.o : stdio_vasprintf.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdio_vasprintf_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdio_vasprintf.c
-
-$(LIBM_OBJS)/stdio_vasprintf_debug.o : stdio_vasprintf.c
-	@echo "Compiling $< [$(TYPE):m debug]"
-	@$(CC) -o $(LIBM_OBJS)/stdio_vasprintf_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG $(FLOAT_TYPE) stdio_vasprintf.c
-
-$(LIBC_OBJS)/string_strdup_debug.o : string_strdup.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/string_strdup_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG string_strdup.c
-
-$(LIBC_OBJS)/unistd_getcwd_debug.o : unistd_getcwd.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/unistd_getcwd_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG unistd_getcwd.c
-
-$(LIBUNIX_OBJS)/unistd_getcwd_debug.o : unistd_getcwd.c
-	@echo "Compiling $< [$(TYPE):unix debug]"
-	@$(CC) -o $(LIBUNIX_OBJS)/unistd_getcwd_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG -DUNIX_PATH_SEMANTICS unistd_getcwd.c
-
-##############################################################################
-
 # Individual build rules for libc.a
 $(LIBC_OBJS) :
 	$(MAKEDIR) $@
@@ -1078,25 +945,7 @@ mainb.o : stdlib_main.c
 	@$(CC) -o mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA stdlib_main.c
 
 bcrtbegin.o : crtbegin.c
-	$(CC) -o bcrtbegin.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtbegin.c
+	$(CC) -o bcrtbegin.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtbegin.c 
 
 bcrtend.o : crtend.c
-	$(CC) -o bcrtend.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtend.c
+	$(CC) -o bcrtend.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtend.c 
-
-baserel/crt0.o : crt0.S
-	@echo "Assembling $<"
-	@$(CC) -Wa,-mregnames -o baserel/crt0.o -mbaserel -DBASEREL_DATA -c crt0.S
-
-baserel/mainnb.o : stdlib_main.c
-	@echo "Compiling $<"
-	@$(CC) -o baserel/mainnb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA stdlib_main.c
-
-baserel/mainb.o : stdlib_main.c
-	@echo "Compiling $<"
-	@$(CC) -o baserel/mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA stdlib_main.c
-
-baserel/crtbegin.o : crtbegin.c
-	$(CC) -o baserel/crtbegin.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA crtbegin.c
-
-baserel/crtend.o : crtend.c
-	$(CC) -o baserel/crtend.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA crtend.c

library/amiga.lib_rev.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga.lib_rev.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga.lib_rev.c,v 1.1.1.1 2004-07-26 16:30:15 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	189
+#define REVISION	184
-#define DATE		"5.3.2005"
+#define DATE		"28.11.2004"
-#define VERS		"amiga.lib 1.189"
+#define VERS		"amiga.lib 1.184"
-#define VSTRING		"amiga.lib 1.189 (5.3.2005)\r\n"
+#define VSTRING		"amiga.lib 1.184 (28.11.2004)\r\n"
-#define VERSTAG		"\0$VER: amiga.lib 1.189 (5.3.2005)"
+#define VERSTAG		"\0$VER: amiga.lib 1.184 (28.11.2004)"

library/amiga.lib_rev.rev

@@ -1 +1 @@
-189
+184

library/amiga_acrypt.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_acrypt.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_acrypt.c,v 1.1.1.1 2004-07-26 16:30:16 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_addtof.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_addtof.c,v 1.3 2005-02-25 10:14:20 obarthel Exp $
+ * $Id: amiga_addtof.c,v 1.1.1.1 2004-07-26 16:30:16 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,7 @@ typedef LONG (* CFUNC)(APTR arg);
 
 /****************************************************************************/
 
-STATIC LONG INTERRUPT ASM
+static LONG INTERRUPT ASM
 call_routine(REG(a1,struct Isrvstr *i))
 {
 	CFUNC p = (CFUNC)i->ccode;

library/amiga_argarraydone.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argarraydone.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_argarraydone.c,v 1.1.1.1 2004-07-26 16:30:16 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_argarrayinit.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argarrayinit.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_argarrayinit.c,v 1.1.1.1 2004-07-26 16:30:16 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_argint.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argint.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_argint.c,v 1.1.1.1 2004-07-26 16:30:16 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_argstring.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argstring.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_argstring.c,v 1.1.1.1 2004-07-26 16:30:16 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_beginio.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_beginio.c,v 1.3 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_beginio.c,v 1.2 2004-11-13 12:55:39 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_callhook.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_callhook.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_callhook.c,v 1.1.1.1 2004-07-26 16:30:17 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_callhooka.asm

@@ -1,10 +1,10 @@
 *
-*	$Id: amiga_callhooka.asm,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+*	$Id: amiga_callhooka.asm,v 1.1.1.1 2004-07-26 16:30:17 obarthel Exp $
 *
 *	:ts=8
 *
 *	Portable ISO 'C' (1994) runtime library for the Amiga computer
-*	Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+*	Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 *	All rights reserved.
 *
 *	Redistribution and use in source and binary forms, with or without

library/amiga_callhooka.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_callhooka.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_callhooka.c,v 1.1.1.1 2004-07-26 16:30:17 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_coercemethod.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_coercemethod.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_coercemethod.c,v 1.1.1.1 2004-07-26 16:30:17 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_createextio.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createextio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_createextio.c,v 1.2 2004-11-10 14:55:30 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_createport.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createport.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_createport.c,v 1.2 2004-11-13 12:55:39 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_createstdio.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createstdio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_createstdio.c,v 1.2 2004-11-10 14:55:30 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_createtask.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createtask.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_createtask.c,v 1.2 2004-11-13 12:55:39 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_deleteextio.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deleteextio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_deleteextio.c,v 1.2 2004-11-10 14:55:30 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_deleteport.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deleteport.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_deleteport.c,v 1.2 2004-11-13 12:55:39 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_deletestdio.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deletestdio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_deletestdio.c,v 1.2 2004-11-10 14:55:30 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_deletetask.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deletetask.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_deletetask.c,v 1.2 2004-11-13 12:55:39 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_domethod.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_domethod.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_domethod.c,v 1.1.1.1 2004-07-26 16:30:19 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_dosupermethod.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_dosupermethod.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_dosupermethod.c,v 1.1.1.1 2004-07-26 16:30:19 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_dotimer.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_dotimer.c,v 1.3 2005-03-06 09:00:16 obarthel Exp $
+ * $Id: amiga_dotimer.c,v 1.1.1.1 2004-07-26 16:30:19 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,37 +58,18 @@ DoTimer(struct timeval *tv,LONG unit,LONG command)
 
 	assert( tv != NULL );
 
-	#if defined(__amigaos4__)
+	mp = AllocVec(sizeof(*mp),MEMF_ANY|MEMF_PUBLIC|MEMF_CLEAR);
+	if(mp == NULL)
 	{
-		mp = AllocSysObjectTags(ASOT_PORT,
+		error = IOERR_OPENFAIL;
-			ASOPORT_Action,	PA_SIGNAL,
+		goto out;
-			ASOPORT_Signal,	SIGB_SINGLE,
-			ASOPORT_Target,	FindTask(NULL),
-		TAG_DONE);
-
-		if(mp == NULL)
-		{
-			error = IOERR_OPENFAIL;
-			goto out;
-		}
 	}
-	#else
-	{
-		mp = AllocVec(sizeof(*mp),MEMF_ANY|MEMF_PUBLIC|MEMF_CLEAR);
-		if(mp == NULL)
-		{
-			error = IOERR_OPENFAIL;
-			goto out;
-		}
 
-		mp->mp_Node.ln_Type	= NT_MSGPORT;
+	mp->mp_Node.ln_Type	= NT_MSGPORT;
-		mp->mp_Flags		= PA_SIGNAL;
+	mp->mp_Flags		= PA_SIGNAL;
-		mp->mp_SigBit		= SIGB_SINGLE;
+	mp->mp_SigBit		= SIGB_SINGLE;
-		mp->mp_SigTask		= FindTask(NULL);
+	mp->mp_SigTask		= FindTask(NULL);
-
+	NewList(&mp->mp_MsgList);
-		NewList(&mp->mp_MsgList);
-	}
-	#endif /* __amigaos4__ */
 
 	tr = (struct timerequest *)CreateIORequest(mp,sizeof(*tr));
 	if(tr == NULL)
@@ -126,16 +107,7 @@ DoTimer(struct timeval *tv,LONG unit,LONG command)
 		DeleteIORequest((struct IORequest *)tr);
 	}
 
-	#if defined(__amigaos4__)
+	FreeVec(mp);
-	{
-		if(mp != NULL)
-			FreeSysObject(ASOT_PORT,mp);
-	}
-	#else
-	{
-		FreeVec(mp);
-	}
-	#endif /* __amigaos4__ */
 
 	return(error);
 }

library/amiga_fastrand.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_fastrand.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_fastrand.c,v 1.1.1.1 2004-07-26 16:30:20 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_freeievents.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_freeievents.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_freeievents.c,v 1.1.1.1 2004-07-26 16:30:20 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_hookentry.asm

@@ -1,10 +1,10 @@
 *
-*	$Id: amiga_hookentry.asm,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+*	$Id: amiga_hookentry.asm,v 1.1.1.1 2004-07-26 16:30:20 obarthel Exp $
 *
 *	:ts=8
 *
 *	Portable ISO 'C' (1994) runtime library for the Amiga computer
-*	Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+*	Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 *	All rights reserved.
 *
 *	Redistribution and use in source and binary forms, with or without

library/amiga_hookentry.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_hookentry.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_hookentry.c,v 1.1.1.1 2004-07-26 16:30:20 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_hotkey.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_hotkey.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_hotkey.c,v 1.1.1.1 2004-07-26 16:30:20 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_invertstring.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_invertstring.c,v 1.3 2005-02-25 10:14:20 obarthel Exp $
+ * $Id: amiga_invertstring.c,v 1.1.1.1 2004-07-26 16:30:20 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@
 
 /****************************************************************************/
 
-STATIC int
+static int
 do_escape(int cc)
 {
 	int result;
@@ -91,7 +91,7 @@ do_escape(int cc)
 
 /****************************************************************************/
 
-STATIC ULONG
+static ULONG
 do_angle(STRPTR * strp, struct InputEvent *ie)
 {
 	ULONG result;

library/amiga_newlist.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_newlist.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_newlist.c,v 1.1.1.1 2004-07-26 16:30:21 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_rangerand.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_rangerand.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_rangerand.c,v 1.1.1.1 2004-07-26 16:30:21 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_remtof.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_remtof.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_remtof.c,v 1.1.1.1 2004-07-26 16:30:21 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_rexxvars.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_rexxvars.c,v 1.3 2005-01-09 10:10:40 obarthel Exp $
+ * $Id: amiga_rexxvars.c,v 1.1 2004-11-14 11:06:27 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,12 +50,12 @@
 
 /****************************************************************************/
 
-static struct Library * RexxSysBase;
+STATIC struct Library * RexxSysBase;
 
 /****************************************************************************/
 
 #if defined(__amigaos4__)
-static struct RexxSysIFace * IRexxSys;
+STATIC struct RexxSysIFace * IRexxSys;
 #endif /* __amigaos4__ */
 
 /****************************************************************************/
@@ -144,7 +144,7 @@ CheckRexxMsg(struct RexxMsg *message)
 LONG
 GetRexxVar(struct RexxMsg *message,STRPTR variable_name,STRPTR *buffer_pointer)
 {
-	static UBYTE buffer[256];
+	STATIC TEXT buffer[256];
 	LONG result;
 
 	/* The following uses a function which was added to rexxsyslib.library V45.

library/amiga_setsuperattrs.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_setsuperattrs.c,v 1.4 2005-02-25 10:14:20 obarthel Exp $
+ * $Id: amiga_setsuperattrs.c,v 1.1.1.1 2004-07-26 16:30:21 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_timedelay.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_timedelay.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_timedelay.c,v 1.1.1.1 2004-07-26 16:30:21 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_waitbeam.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_waitbeam.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_waitbeam.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/c.lib_rev.c

@@ -1,10 +1,10 @@
 /*
- * $Id: c.lib_rev.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: c.lib_rev.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/c.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	189
+#define REVISION	184
-#define DATE		"5.3.2005"
+#define DATE		"28.11.2004"
-#define VERS		"c.lib 1.189"
+#define VERS		"c.lib 1.184"
-#define VSTRING		"c.lib 1.189 (5.3.2005)\r\n"
+#define VSTRING		"c.lib 1.184 (28.11.2004)\r\n"
-#define VERSTAG		"\0$VER: c.lib 1.189 (5.3.2005)"
+#define VERSTAG		"\0$VER: c.lib 1.184 (28.11.2004)"

library/c.lib_rev.rev

@@ -1 +1 @@
-189
+184

library/changes

@@ -1,374 +1,3 @@
-- DoTimer() now calls AllocSysObject() rather than making up
-  a MsgPort locally.
-
-- The record locking semaphore code now builds a semaphore to add
-  before it tries to find the public one in memory. That way, the
-  code can spend less time in Forbid() state and, heaven forbid,
-  refrain from allocating memory while in that state.
-
-- Split the general stdio initialization/cleanup code from the
-  initialization of the stdin/stdout/stderr streams.
-
-- Moved the Workbench console stream initialization into the
-  initialization code for the stdin/stdout/stderr streams and
-  out of the program parameter setup.
-
-- The current program name is now set up in the stdlib
-  initialization function.
-
-- Simplified the machine test code; moved the FPU check into
-  the math initialization code.
-
-- Added more safety checks to verify that file descriptor
-  file handles are valid.
-
-- Made the file descriptor checks in the fsync() and fdatasync()
-  functions more robust.
-
-- Cleaned up the 68k build makefile, so that the CPU and FPU
-  tests and the error message display can run safely even
-  on plain 68000 machines. This won't work for the 32 bit small
-  data model, which implies 68020 code, but so there...
-
-- Moved the CPU/FPU type tests into the respective linker
-  libraries.
-
-- Moved the data declarations out of math_data.c, stat_data.c,
-  socket_data.c, dirent_data.c and stdio_data.c and into the
-  code that initializes them.
-
-- Moved a few __delete_semaphore() calls into conditional compilation
-  sections where they should have been in the first place.
-
-- Thanks to Jörg Strohmayer, the GCC library build now manages to
-  invoke the library's constructor/destructor functions in a
-  very particular order. That way, you can use constructor/destructor
-  functions in your own code and not have them clash with the library's
-  own functions.
-
-- Reimplemented the constructor/destructor invocation code for GCC.
-  Both the 68k and PowerPC platform now invoke them in the same order
-  and the 68k code uses the designated invocation priorities. The
-  PowerPC destructor function now sets up the exit() jmp_buf before
-  the destructor functions are called.
-
-- Added S_IREAD, S_IWRITE and S_IEXEC aliases to <sys/stat.h>.
-
-- Moved data out of stdlib_data.c and into the code that references
-  or initializes it.
-
-- The stdlib constructor now performs the CPU/FPU compatibility test.
-
-- Introduced new constructor types and changed the overall priority
-  order.
-
-
-c.lib 1.189 (5.3.2005)
-
-- Rewrote the __translate_unix_to_amiga_path_name() function to
-  translate patterns such as "foo/bar/../../baz" properly, and to
-  use strlen() a lot less.
-
-- Major, major changes! Moved most of the monolithic code out of
-  the file descriptor hook and into the respective functions,
-  such as dup2(), fchmod(), fchown(), fcntl(), fdatasync(), fstatfs(),
-  fsync(), ftruncate() and lseek(). Code which is not strictly
-  required will no longer find its way into your programs if you
-  link with the updated library.
-
-  NOTE: these changes require that the entire library is rebuilt!
-
-- The buffered and unbuffered file hook code is now invoked through
-  function pointers alone. The utility.library/CallHookPkt mechanism
-  is no longer required.
-
-- Moved the entire lseek() code relevant for files into the hook
-  function.
-
-- Simplified the close() function which now just calls into the
-  hook code to perform whatever is necessary. The hook code is
-  responsible for cleaning up after aliases, etc. This change in
-  turn made it possible to greatly simplify the hook code for
-  buffered files which now bypasses close/read/write/lseek and
-  directly invokes the hook code for unbuffered files.
-
-- Added various floating point constants to <math.h>, courtesy
-  of Henning Nielsen Lund. Thank you very much!
-
-- When using the wildcard expansion code for command line
-  parameters (which is by default linked in with libunix.a),
-  regular expressions can no longer prompt dos.library requesters
-  to appear. However, to be on the safe side, if you are expecting
-  to pass regular expressions on the command line, do not use
-  the wildcard expansion code such as by overriding the library
-  symbols with dummy functions such as are used in the file
-  "stdlib_wildcard_expand.c".
-
-- Added a new variable '__open_locale' which can be used to
-  restrict all library functions to use the "C" language locale
-  rather than the current system locale settings. In addition
-  to that, two new functions __locale_exit() and __locale_init()
-  can be used to close and (re-)open the system locale at a
-  later time.
-
-- Local ("static") functions are now identified by the STATIC
-  qualifier. This was done in preparation for changes that will
-  deal with global and local data and the issue of thread safety.
-
-- Added stdio thread locking functions flockfile(), funlockfile(),
-  and ftrylockfile().
-
-- Modified the internal FILE structure to allow for thread locking.
-  Note that this again requires that the library is rebuilt!
-
-- Added or modified macros for getc_unlocked(), getchar_unlocked(),
-  putc_unlocked() and putchar_unlocked().
-
-- Added rand_r().
-
-- Added flockfile()/funlockfile() wrappers around all stdio
-  functions.
-
-- Added more semaphore locking around the basic stdio, memory, locale
-  and dirent data operations. That should do it! While the library is
-  not reentrant (this is not ixemul.library) it should be thread-safe
-  now. Thread-safe in the sense of POSIX 1003.1c-1995.
-
-- The thread-safety code is now subject to conditional compilation.
-  Both the library and the user code need to be rebuilt with the
-  preprocessor symbol __THREAD_SAFE defined to get thread-safe
-  code.
-
-- Extended the thread-safety locking to the file descriptors.
-
-  NOTE: these changes require that the entire library is rebuilt!
-
-- The translation of Unix to Amiga path names now silently accepts
-  absolute Amiga path names passed to it and will use them without
-  changing them.
-
-- Added atoll(), ffs(), ftw(), nftw(), lstat() and uname() code
-  contributed by Peter Bengtsson. Thank you very much!
-
-- Reworked the code that handles quoting for the wildcard expansion
-  routine. We no longer allocate memory and then modify it, but
-  call a function for each quoted parameter which does whatever is
-  necessary.
-
-- The shell command parameter parser now considers the non-breaking
-  space character (ISO code 160) to be a blank space character, too.
-
-- Moved the signal semaphore allocation/initialization/deallocation
-  into a dedicated module. This also has the advantage that it's
-  harder to break code by accidentally forgetting to call
-  InitSemaphore() after having allocated the memory for it.
-
-- Rewrote the code that allocates the file descriptor and file
-  buffer tables so that all the memory allocations are in one
-  place and it's possible to specify exactly how many table
-  entries are required at a time.
-
-- Creation and initialization of semaphores now uses the AmigaOS4
-  specific functions for this purpose, if available.
-
-- In the thread-safe variant, the library now tries to allow
-  multiple concurrent callers to use the socket functions. Note
-  that this works only with the Roadshow TCP/IP stack, and the
-  results with other TCP/IP stacks are rather unpredictable.
-
-
-c.lib 1.188 (7.2.2005)
-
-- Folded duplicate code in "stdio_init_exit.c" into a common function.
-
-- Simplified the code in "time_asctime_r.c" which builds the time
-  string. It gracefully handles buffer sizes which are too short
-  by returning an empty string.
-
-- Moved the "tm->tm_wday" initialization out of the hook function
-  in "time_strftime.c" since it was to be called only once anyway.
-
-- Lost a few compiler warnings in "unistd_time_delay.c" and
-  "time_gettimeofday.c".
-
-- Folded duplicate code in "time_mktime.c"; also, errno is no longer
-  modified unless the library is built with the "CHECK_FOR_NULL_POINTERS"
-  option.
-
-- We now allocate the AnchorPath used in the unistd_wildcard_expand.c
-  code. Also, the contents of the AnchorPath structure are no longer
-  modified between calls. MatchEnd() has to be sufficient.
-
-- Moved redundant code out of the readdir()/opendir()/closedir()
-  functions which is not required unless the code is built for
-  Unix compatibility mode.
-
-- Lost the __not_a_number and __infinity variables, including the
-  code which initialized them.
-
-- Reading/changing the errno variable is no longer done directly, but
-  involves accessor functions.
-
-- References to the HUGE_VAL quantity now involve an accessor function, too.
-
-- Changed the manner in which the __huge_val constant is initialized by
-  the __math_init() function. The new approach should be more portable.
-
-- The library no longer sends ACTION_DISK_INFO packets to the console
-  handler. The side-effects were too varied and irritating after all.
-
-- Added the fsync() and fdatasync() functions and the <stdint.h> and
-  <inttypes.h> header files contributed by Peter Bengtsson. Thank
-  you very much!
-
-- Tweaked the build makefiles to produce fewer meaningless warnings.
-
-
-c.lib 1.187 (29.1.2005)
-
-- The default console output window opened when a program is launched
-  from Workbench would open and stay open. This was not intended to
-  happen and is a side-effect of the new stdio initialization code which
-  checks if the stdio streams are in non-blocking mode. Fixed.
-
-- Moved the common DateStamp to time_t conversion code into a shared
-  function.
-
-- The fall-back function for converting time into a string in strftime()
-  now calls itself for the "%c", "%x" and "%X" format specifiers.
-
-- mktime() is supposed to convert the time specification, given as local
-  time, into the number of seconds since January 1st, 1970, relative to
-  UTC. This didn't really work up until now since the time value returned
-  was given as local time.
-
-- Plugged in a different algorithm for calculating the day of the week in
-  strftime() and asctime_r(). This one isn't sensitive to the effects of
-  adding/subtracting the local time zone.
-
-- Changed the algorithm that calculates the number of days that have passed
-  so far as used by the the __convert_time() function and the conversion
-  code in strftime().
-
-- Also changed the algorithm used by strftime() to produce the week numbers
-  (the '%U' and '%W' format specifiers). The new method is much simpler
-  than the old one.
-
-- Made the code that converts a 'time_t' value into the 'struct DateStamp',
-  as used by strftime() and utime(), into its own function. This also
-  fixes a bug in the code strftime() would use which was completely
-  unaware of the local time zone settings.
-
-
-c.lib 1.186 (14.1.2005)
-
-- Redirecting stderr to a file no longer has the effect of showing error
-  messages and assertion failure notifications as requesters. The exception
-  is in redirecting stderr to NIL: which will prompt the requester use.
-
-- gettimeofday() now calls GetSysTime() rather than DateStamp() to obtain
-  the current system time. This resolves granularity issues since the
-  DateStamp() result was only accurate by 1/50 of a second.
-
-- The "ptrdiff_t" definition in <stddef.h> now defaults to type 'int' rather
-  than 'long int'.
-
-- The "char" limits in <limits.h> are now set up according to the current
-  compiler settings, which can either default to an unsigned or
-  signed definition.
-
-- Changed the rules again for the use of stderr/stdout redirection when
-  printing error messages. It is always safe to redirect them now and
-  no requester will appear unless you specifically set the value of the
-  "__no_standard_io" variable to TRUE in your program.
-
-- Removed a misplaced IsInteractive() from the stdio initialization
-  function. Now this could have been big trouble...
-
-- Removed tests for FileHandle->fh_Type != NULL which used to precede
-  all IsInterative() tests. I verified that IsInteractive() will always
-  return FALSE for NIL: type file handles.
-
-- Dropped the special flag variable used by the abort() function that
-  tracks whether or not console output is possible. We now use the
-  global "__no_standard_io" instead.
-
-- Made the <ctype.h> macros more robust.
-
-- Removed the "NIL:" file handle tests preceding the Open("CONSOLE:",..)
-  calls. As of Kickstart 2.x and beyond these are no longer a source of
-  trouble.
-
-- The V37/V40 compatibility code is no longer built for the AmigaOS4
-  version of the library.
-
-- Switched over the last use of DeviceProc() to GetDeviceProc(), etc.
-
-- open() no longer examines a file after opening it in order to figure
-  out whether read/write accesses are permitted. This decision is now
-  for the file system to make.
-
-- Whether or not stdio console streams are blocking or non-blocking
-  is now determined at initialization time. The I/O mode is restored before
-  the program exits. Previously, any changes to the I/O mode would persist.
-
-- Lost some more code that is not required for AmigaOS 4.x and can be
-  handled conveniently through conditional compilation.
-
-- close() did not reset the non-blocking file property, as it should
-  have. This only worked for files which were closed anyway, but not
-  for the stdio streams. Fixed.
-
-- Added a missing definition to stdio_init_exit.c which is part of
-  the OS4 header files, but not of the older header file distributions.
-
-
-
-c.lib 1.185 (2.1.2005)
-
-- Moved the environment variable cleanup code into a destructor function.
-
-- Fixed a typo in the hstrerror() function.
-
-- The common error reporting function __show_error() could throw Enforcer
-  hits if the program was not launched from Shell. Fixed.
-
-- Moved the memory initialization and cleanup functions into the
-  malloc/free code itself and updated the alloca code to do its
-  own data management.
-
-- Finally optimized the alloca() memory cleanup code.
-
-- Tried to make it possible to have debug versions of the memory
-  management code in the default link library along with the
-  normal versions. Let's see how well this works out in the GCC
-  version. SAS/C does not seem to like it...
-
-- Changed the definition of alloca() for GCC, which now defaults 
-  to the built-in function.
-
-- Updated the stdio.h, stdlib.h, string.h and unistd.h header files
-  to declare function prototypes for the __MEM_DEBUG versions of the
-  library functions only if that preprocessor symbol is defined.
-
-- If a SIGINT signal is caught and processed by the default signal
-  handler, the localized "*** BREAK" string will be printed rather
-  than the built-in one.
-
-- The data structure alignment (file I/O buffer) is now configurable
-  at compile time. The default used to be 16 bytes, which is appropriate
-  for the 68040/68060 but not for the PowerPC, which uses 32 or 128
-  bytes per cache line.
-
-- fwrite() now flushes the entire "buffer" for unbuffered files. The
-  exception are "interactive" files such as console windows. For these
-  line buffered output is used.
-
-- Whether or not a file is bound to an interactive device, such as a
-  console window, is now checked and remembered after a file descriptor
-  has been associated with it.
-
-
 c.lib 1.184 (28.11.2004)
 
 - Added asctime_r(), ctime_r(), gmtime_r(), localtime_r() and strtok_r().

library/crt0.S

@@ -1,5 +1,5 @@
 //
-//	$Id: crt0.S,v 1.2 2004-11-28 12:31:27 tfrieden Exp $
+//	$Id: crt0.S,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
 //
 //	:ts=4
 //
@@ -18,23 +18,5 @@ _start:
 	addi r13, r13, _SDA_BASE_@l
 #endif
 
-#if defined(BASEREL_DATA)
-	/* We also need to set up the data segment pointer */
-	lis r2, _DATA_BASE_@ha
-	addi r2, r2, _DATA_BASE_@l
-#endif
-
 	b	_main
 
-#if defined(BASEREL_DATA)
-	.section .rodata
-
-	.globl __data_segment_descriptor
-__data_segment_descriptor:
-	.long __data_start
-	.long __data_end
-	.long _DATA_BASE_
-
-	.section .dend, "wa", @nobits
-	.space 	4
-#endif

library/crtbegin.c

@@ -1,15 +1,11 @@
 /* 
- * $Id: crtbegin.c,v 1.8 2005-03-10 13:30:11 obarthel Exp $
+ * $Id: crtbegin.c,v 1.3 2004-09-29 16:54:54 obarthel Exp $
  *
  * :ts=4
  *
- * Handles global constructors and destructors for the OS4 GCC build.
+ * Handles global constructors and destructors.
  */
 
-#if defined(__amigaos4__)
-
-/****************************************************************************/
-
 #include <exec/types.h>
 
 /****************************************************************************/
@@ -19,28 +15,118 @@
 
 /****************************************************************************/
 
+#if defined(__amigaos4__)
+
+/****************************************************************************/
+
 /*
  * Dummy constructor and destructor array. The linker script will put these at the
  * very beginning of section ".ctors" and ".dtors". crtend.o contains a similar entry
  * with a NULL pointer entry and is put at the end of the sections. This way, the init
  * code can find the global constructor/destructor pointers
  */
-static void (*__CTOR_LIST__[1]) (void) __attribute__(( used, section(".ctors"), aligned(sizeof(void (*)(void))) ));
+static void (*__CTOR_LIST__[1]) (void) __attribute__((section(".ctors"))) = { (void *)-1 };
-static void (*__DTOR_LIST__[1]) (void) __attribute__(( used, section(".dtors"), aligned(sizeof(void (*)(void))) ));
+static void (*__DTOR_LIST__[1]) (void) __attribute__((section(".dtors"))) = { (void *)-1 };
+
+/****************************************************************************/
+
+static void
+_do_ctors(void)
+{
+	void (**pFuncPtr)(void);
+
+	/* Skip the first entry in the list (it's -1 anyway) */
+	pFuncPtr = __CTOR_LIST__ + 1;
+
+	/* Call all constructors in forward order */
+	while (*pFuncPtr != NULL)
+		(**pFuncPtr++)();
+}
+
+/****************************************************************************/
+
+static void
+_do_dtors(void)
+{
+	ULONG i = (ULONG)__DTOR_LIST__[0];
+	void (**pFuncPtr)(void);
+
+	if (i == ~0UL)
+	{
+		/* Find the end of the destructors list */
+		i = 1;
+
+		while (__DTOR_LIST__[i] != NULL)
+			i++;
+
+		/* We're at the NULL entry now. Go back by one */
+		i--;
+	}
+
+	/* Call all destructors in reverse order */
+	pFuncPtr = __DTOR_LIST__ + i;
+	while (i-- > 0)
+		(**pFuncPtr--)();
+}
+
+/****************************************************************************/
+
+#else
+
+/****************************************************************************/
+
+typedef void (*func_ptr)(void);
+
+/****************************************************************************/
+
+static void
+_do_ctors(void)
+{
+	extern func_ptr __CTOR_LIST__[];
+	ULONG nptrs = (ULONG)__CTOR_LIST__[0];
+	ULONG i;
+
+	for(i = nptrs ; i > 0 ; i--)
+		__CTOR_LIST__[i]();
+}
+
+/****************************************************************************/
+
+static void
+_do_dtors(void)
+{
+	extern func_ptr __DTOR_LIST__[];
+	extern jmp_buf __exit_jmp_buf;
+	ULONG nptrs = (ULONG)__DTOR_LIST__[0];
+	static ULONG i;
+
+	/* If one of the destructors drops into
+	 * exit(), processing will continue with
+	 * the next following destructor.
+	 */
+	(void)setjmp(__exit_jmp_buf);
+
+	while(i++ < nptrs)
+		__DTOR_LIST__[i]();
+}
+
+/****************************************************************************/
+
+#endif /*__amigaos4__ */
+
+/****************************************************************************/
+
+/* FIXME: Do we need to put these in .init/.fini sections? */
+
+//void _init(void) __attribute__((section(".init")));
+//void _fini(void) __attribute__((section(".fini")));
 
 /****************************************************************************/
 
 void
 _init(void)
 {
-	int num_ctors,i;
+	_do_ctors();
-	int j;
-
-	for(i = 1, num_ctors = 0 ; __CTOR_LIST__[i] != NULL ; i++)
-		num_ctors++;
-
-	for(j = 0 ; j < num_ctors ; j++)
-		__CTOR_LIST__[num_ctors - j]();
 }
 
 /****************************************************************************/
@@ -48,23 +134,5 @@ _init(void)
 void
 _fini(void)
 {
-	extern jmp_buf __exit_jmp_buf;
+	_do_dtors();
-
-	int num_dtors,i;
-	static int j;
-
-	/* If one of the destructors drops into
-	   exit(), processing will continue with
-	   the next following destructor. */
-	(void)setjmp(__exit_jmp_buf);
-
-	for(i = 1, num_dtors = 0 ; __DTOR_LIST__[i] != NULL ; i++)
-		num_dtors++;
-
-	while(j++ < num_dtors)
-		__DTOR_LIST__[j]();
 }
-
-/****************************************************************************/
-
-#endif /*__amigaos4__ */

library/crtend.c

@@ -1,5 +1,5 @@
 /* 
- * $Id: crtend.c,v 1.2 2005-03-09 21:07:25 obarthel Exp $
+ * $Id: crtend.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
  *
  * :ts=4
  *
@@ -10,10 +10,9 @@
 
 /****************************************************************************/
 
-static void (*__CTOR_LIST__[1]) (void) __attribute__((used, section(".ctors"), aligned(sizeof(void (*)(void))) ));
+static volatile void (*__CTOR_LIST__[1]) (void) __attribute__((used,section(".ctors"))) = { (void *)0 };
-static void (*__DTOR_LIST__[1]) (void) __attribute__((used, section(".dtors"), aligned(sizeof(void (*)(void))) ));
+static volatile void (*__DTOR_LIST__[1]) (void) __attribute__((used,section(".dtors"))) = { (void *)0 };
 
 /****************************************************************************/
 
 #endif /*__amigaos4__ */
-

library/ctype_headers.h

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_headers.h,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_headers.h,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/ctype_isalnum.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isalnum.c,v 1.3 2005-02-27 21:58:21 obarthel Exp $
+ * $Id: ctype_isalnum.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,8 +49,6 @@ isalnum(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
@@ -62,7 +60,5 @@ isalnum(int c)
 		result = isalpha(c) || isdigit(c);
 	}
 
-	__locale_unlock();
-
 	return(result);
 }

library/ctype_isalpha.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isalpha.c,v 1.3 2005-02-27 21:58:21 obarthel Exp $
+ * $Id: ctype_isalpha.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,8 +47,6 @@ isalpha(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
@@ -61,7 +59,5 @@ isalpha(int c)
 		          ('A' <= c && c <= 'Z'));
 	}
 
-	__locale_unlock();
-
 	return(result);
 }

library/ctype_isascii.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isascii.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isascii.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/ctype_iscntrl.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_iscntrl.c,v 1.3 2005-02-27 21:58:21 obarthel Exp $
+ * $Id: ctype_iscntrl.c,v 1.1.1.1 2004-07-26 16:30:23 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,8 +47,6 @@ iscntrl(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
@@ -60,7 +58,5 @@ iscntrl(int c)
 		result = (('\0' <= c && c < ' ') || (c == 127));
 	}
 
-	__locale_unlock();
-
 	return(result);
 }

library/ctype_isdigit.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isdigit.c,v 1.3 2005-02-27 21:58:21 obarthel Exp $
+ * $Id: ctype_isdigit.c,v 1.1.1.1 2004-07-26 16:30:23 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,8 +47,6 @@ isdigit(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
@@ -60,7 +58,5 @@ isdigit(int c)
 		result = ('0' <= c && c <= '9');
 	}
 
-	__locale_unlock();
-
 	return(result);
 }

library/ctype_isgraph.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isgraph.c,v 1.3 2005-02-27 21:58:21 obarthel Exp $
+ * $Id: ctype_isgraph.c,v 1.1.1.1 2004-07-26 16:30:23 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,8 +47,6 @@ isgraph(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
@@ -60,7 +58,5 @@ isgraph(int c)
 		result = (' ' < c && c < 127);
 	}
 
-	__locale_unlock();
-
 	return(result);
 }

library/ctype_islower.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_islower.c,v 1.3 2005-02-27 21:58:21 obarthel Exp $
+ * $Id: ctype_islower.c,v 1.1.1.1 2004-07-26 16:30:23 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,8 +47,6 @@ islower(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
@@ -60,7 +58,5 @@ islower(int c)
 		result = ('a' <= c && c <= 'z');
 	}
 
-	__locale_unlock();
-
 	return(result);
 }

library/ctype_isprint.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isprint.c,v 1.3 2005-02-27 21:58:21 obarthel Exp $
+ * $Id: ctype_isprint.c,v 1.1.1.1 2004-07-26 16:30:23 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,8 +47,6 @@ isprint(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
@@ -60,7 +58,5 @@ isprint(int c)
 		result = (' ' <= c && c <= '~');
 	}
 
-	__locale_unlock();
-
 	return(result);
 }

library/ctype_ispunct.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_ispunct.c,v 1.3 2005-02-27 21:58:21 obarthel Exp $
+ * $Id: ctype_ispunct.c,v 1.1.1.1 2004-07-26 16:30:23 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,8 +47,6 @@ ispunct(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
@@ -63,7 +61,5 @@ ispunct(int c)
 		          ('{' <= c && c <= '~'));
 	}
 
-	__locale_unlock();
-
 	return(result);
 }

library/ctype_isspace.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isspace.c,v 1.3 2005-02-27 21:58:21 obarthel Exp $
+ * $Id: ctype_isspace.c,v 1.1.1.1 2004-07-26 16:30:23 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,8 +47,6 @@ isspace(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
@@ -65,7 +63,5 @@ isspace(int c)
 		          c == ' ');
 	}
 
-	__locale_unlock();
-
 	return(result);
 }

library/ctype_isupper.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isupper.c,v 1.3 2005-02-27 21:58:21 obarthel Exp $
+ * $Id: ctype_isupper.c,v 1.1.1.1 2004-07-26 16:30:24 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,8 +47,6 @@ isupper(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
@@ -60,7 +58,5 @@ isupper(int c)
 		result = ('A' <= c && c <= 'Z');
 	}
 
-	__locale_unlock();
-
 	return(result);
 }

library/ctype_isxdigit.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isxdigit.c,v 1.3 2005-02-27 21:58:21 obarthel Exp $
+ * $Id: ctype_isxdigit.c,v 1.1.1.1 2004-07-26 16:30:24 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,8 +47,6 @@ isxdigit(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
@@ -62,7 +60,5 @@ isxdigit(int c)
 		          ('A' <= c && c <= 'F'));
 	}
 
-	__locale_unlock();
-
 	return(result);
 }

library/ctype_table.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_table.c,v 1.3 2005-01-09 15:20:31 obarthel Exp $
+ * $Id: ctype_table.c,v 1.1.1.1 2004-07-26 16:30:24 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,22 @@
 
 /****************************************************************************/
 
-const unsigned char __ctype_table[2 * 128] =
+/* The construction of this table is rather peculiar. The assumption is that
+   the table index from which a flag value could be fetched is in the range
+   -128..255 since the character to be tested could be a signed or unsigned
+   8 bit value. The table access pointer (declared below) therefore points
+   to the 128th byte of '__ctype_data[]'. */
+static const unsigned char __ctype_data[3 * 128] =
 {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
 	/*   0      */ __CTYPE_CONTROL,
 	/*   1      */ __CTYPE_CONTROL,
 	/*   2      */ __CTYPE_CONTROL,
@@ -176,3 +190,7 @@ const unsigned char __ctype_table[2 * 128] =
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
+
+/****************************************************************************/
+
+const unsigned char * const __ctype_table = &__ctype_data[128];

library/ctype_tolower.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_tolower.c,v 1.3 2005-02-27 21:58:21 obarthel Exp $
+ * $Id: ctype_tolower.c,v 1.1.1.1 2004-07-26 16:30:25 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,8 +43,6 @@ tolower(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
@@ -56,7 +54,5 @@ tolower(int c)
 		result = ('A' <= c && c <= 'Z') ? (c + ('a' - 'A')) : c;
 	}
 
-	__locale_unlock();
-
 	return(result);
 }

library/ctype_toupper.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_toupper.c,v 1.3 2005-02-27 21:58:21 obarthel Exp $
+ * $Id: ctype_toupper.c,v 1.1.1.1 2004-07-26 16:30:25 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,8 +43,6 @@ toupper(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
@@ -56,7 +54,5 @@ toupper(int c)
 		result = ('a' <= c && c <= 'z') ? (c - ('a' - 'A')) : c;
 	}
 
-	__locale_unlock();
-
 	return(result);
 }

library/debug.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug.c,v 1.3 2005-02-25 10:14:21 obarthel Exp $
+ * $Id: debug.c,v 1.1.1.1 2004-07-26 16:30:25 obarthel Exp $
  *
  * :ts=8
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -133,7 +133,7 @@ _POPDEBUGLEVEL(void)
 
 /****************************************************************************/
 
-STATIC VOID
+static void
 _INDENT(void)
 {
 	if(program_name_len > 0)

library/debug.h

@@ -1,10 +1,10 @@
 /*
- * $Id: debug.h,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug.h,v 1.2 2004-11-14 11:06:27 obarthel Exp $
  *
  * :ts=8
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug.lib_rev.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug.lib_rev.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug.lib_rev.c,v 1.1.1.1 2004-07-26 16:30:26 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	189
+#define REVISION	184
-#define DATE		"5.3.2005"
+#define DATE		"28.11.2004"
-#define VERS		"debug.lib 1.189"
+#define VERS		"debug.lib 1.184"
-#define VSTRING		"debug.lib 1.189 (5.3.2005)\r\n"
+#define VSTRING		"debug.lib 1.184 (28.11.2004)\r\n"
-#define VERSTAG		"\0$VER: debug.lib 1.189 (5.3.2005)"
+#define VERSTAG		"\0$VER: debug.lib 1.184 (28.11.2004)"

library/debug.lib_rev.rev

@@ -1 +1 @@
-189
+184

library/debug_cmpstrexec.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_cmpstrexec.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_cmpstrexec.c,v 1.1.1.1 2004-07-26 16:30:26 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_headers.h

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_headers.h,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_headers.h,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kcmpstr.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kcmpstr.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kcmpstr.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kdofmt.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kdofmt.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kdofmt.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kgetc.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetc.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kgetc.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kgetch1.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetch1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kgetch1.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kgetch2.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetch2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kgetch2.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kgetchar1.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetchar1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kgetchar1.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kgetchar2.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetchar2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kgetchar2.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kgetnum1.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetnum1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kgetnum1.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kgetnum2.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetnum2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kgetnum2.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kmaygetch.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kmaygetch.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kmaygetch.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kmaygetchar.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kmaygetchar.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kmaygetchar.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kprintf1.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kprintf1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kprintf1.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kprintf2.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kprintf2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kprintf2.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kputc.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputc.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputc.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kputch1.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputch1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputch1.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kputch2.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputch2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputch2.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kputchar1.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputchar1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputchar1.c,v 1.1.1.1 2004-07-26 16:30:29 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kputchar2.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputchar2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputchar2.c,v 1.1.1.1 2004-07-26 16:30:29 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kputfmt.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputfmt.c,v 1.3 2005-02-25 10:14:21 obarthel Exp $
+ * $Id: debug_kputfmt.c,v 1.1.1.1 2004-07-26 16:30:29 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
    parameter table is provided, pick up the parameters and store them in
    the table. The table layout follows the format string and can include
    both 16 and 32 bit data. */
-STATIC size_t
+static size_t
 process_var_args(char *format_string,va_list argument_list,unsigned short * table)
 {
 	size_t num_args = 0;
@@ -150,7 +150,7 @@ process_var_args(char *format_string,va_list argument_list,unsigned short * tabl
 
 /****************************************************************************/
 
-STATIC VOID ASM
+static VOID ASM
 raw_put_char(REG(d0,UBYTE c))
 {
 	kputc(c); 

library/debug_kputs1.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputs1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputs1.c,v 1.1.1.1 2004-07-26 16:30:29 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kputs2.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputs2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputs2.c,v 1.1.1.1 2004-07-26 16:30:29 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kputstr1.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputstr1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputstr1.c,v 1.1.1.1 2004-07-26 16:30:30 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kputstr2.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputstr2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputstr2.c,v 1.1.1.1 2004-07-26 16:30:30 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kvprintf1.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kvprintf1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kvprintf1.c,v 1.1.1.1 2004-07-26 16:30:30 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_kvprintf2.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kvprintf2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kvprintf2.c,v 1.1.1.1 2004-07-26 16:30:30 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_level.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_level.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_level.c,v 1.1.1.1 2004-07-26 16:30:30 obarthel Exp $
  *
  * :ts=8
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/dirent_closedir.c

@@ -1,10 +1,10 @@
 /*
- * $Id: dirent_closedir.c,v 1.8 2005-03-09 10:48:59 obarthel Exp $
+ * $Id: dirent_closedir.c,v 1.2 2004-08-07 09:15:32 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,97 +47,11 @@
 
 /****************************************************************************/
 
-/* Directories being scanned whose locks need to be freed when shutting down. */
-struct MinList NOCOMMON __directory_list;
-
-/****************************************************************************/
-
-#if defined(__THREAD_SAFE)
-
-/****************************************************************************/
-
-static struct SignalSemaphore * dirent_lock;
-
-/****************************************************************************/
-
-void
-__dirent_lock(void)
-{
-	if(dirent_lock != NULL)
-		ObtainSemaphore(dirent_lock);
-}
-
-/****************************************************************************/
-
-void
-__dirent_unlock(void)
-{
-	if(dirent_lock != NULL)
-		ReleaseSemaphore(dirent_lock);
-}
-
-/****************************************************************************/
-
-#endif /* __THREAD_SAFE */
-
-/****************************************************************************/
-
-CLIB_CONSTRUCTOR(__dirent_init)
-{
-	BOOL success = FALSE;
-
-	ENTER();
-
-	NewList((struct List *)&__directory_list);
-
-	#if defined(__THREAD_SAFE)
-	{
-		dirent_lock = __create_semaphore();
-		if(dirent_lock == NULL)
-			goto out;
-	}
-	#endif /* __THREAD_SAFE */
-
-	success = TRUE;
-
- out:
-
-	RETURN(success);
-
-	if(success)
-		CONSTRUCTOR_SUCCEED();
-	else
-		CONSTRUCTOR_FAIL();
-}
-
-/****************************************************************************/
-
-CLIB_DESTRUCTOR(__dirent_exit)
-{
-	ENTER();
-
-	if(__directory_list.mlh_Head != NULL)
-	{
-		while(NOT IsListEmpty((struct List *)&__directory_list))
-			closedir((DIR *)__directory_list.mlh_Head);
-	}
-
-	#if defined(__THREAD_SAFE)
-	{
-		__delete_semaphore(dirent_lock);
-		dirent_lock = NULL;
-	}
-	#endif /* __THREAD_SAFE */
-
-	LEAVE();
-}
-
-/****************************************************************************/
-
 int
 closedir(DIR * directory_pointer)
 {
 	struct DirectoryHandle * dh;
+	struct Node * node;
 	int result = -1;
 
 	ENTER();
@@ -147,11 +61,9 @@ closedir(DIR * directory_pointer)
 	if(__check_abort_enabled)
 		__check_abort();
 
-	__dirent_lock();
-
 	if(directory_pointer == NULL)
 	{
-		__set_errno(EBADF);
+		errno = EBADF;
 		goto out;
 	}
 
@@ -172,7 +84,7 @@ closedir(DIR * directory_pointer)
 
 		if(NOT directory_pointer_is_valid)
 		{
-			__set_errno(EBADF);
+			errno = EBADF;
 			goto out;
 		}
 	}
@@ -182,14 +94,8 @@ closedir(DIR * directory_pointer)
 
 	Remove((struct Node *)dh);
 
-	#if defined(UNIX_PATH_SEMANTICS)
+	while((node = RemHead(&dh->dh_VolumeList)) != NULL)
-	{
+		free(node);
-		struct Node * node;
-
-		while((node = RemHead((struct List *)&dh->dh_VolumeList)) != NULL)
-			free(node);
-	}
-	#endif /* UNIX_PATH_SEMANTICS */
 
 	PROFILE_OFF();
 	UnLock(dh->dh_DirLock);
@@ -201,8 +107,6 @@ closedir(DIR * directory_pointer)
 
  out:
 
-	__dirent_unlock();
-
 	RETURN(result);
 	return(result);
 }

library/dirent_data.c

@@ -1,10 +1,10 @@
 /*
- * $Id: stdio_putchar_unlocked.c,v 1.1 2005-02-27 18:09:11 obarthel Exp $
+ * $Id: dirent_data.c,v 1.4 2004-10-24 20:03:42 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,42 +31,38 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _STDLIB_NULL_POINTER_CHECK_H
+#ifndef _DIRENT_HEADERS_H
-#include "stdlib_null_pointer_check.h"
+#include "dirent_headers.h"
-#endif /* _STDLIB_NULL_POINTER_CHECK_H */
+#endif /* _DIRENT_HEADERS_H */
 
 /****************************************************************************/
 
-#ifndef _STDIO_HEADERS_H
+/* Directories being scanned whose locks need to be freed when shutting down. */
-#include "stdio_headers.h"
+struct MinList NOCOMMON __directory_list;
-#endif /* _STDIO_HEADERS_H */
 
 /****************************************************************************/
 
-#undef putchar_unlocked
+CLIB_CONSTRUCTOR(__dirent_init)
-
-/****************************************************************************/
-
-int
-putchar_unlocked(int c)
 {
-	int result = -1;
+	ENTER();
 
-	assert( stdout != NULL );
+	NewList((struct List *)&__directory_list);
 
-	#if defined(CHECK_FOR_NULL_POINTERS)
+	RETURN(OK);
-	{
+	CONSTRUCTOR_SUCCEED();
-		if(stdout == NULL)
+}
-		{
+
-			__set_errno(EFAULT);
+/****************************************************************************/
-			goto out;
+
-		}
+CLIB_DESTRUCTOR(__dirent_exit)
-	}
+{
-	#endif /* CHECK_FOR_NULL_POINTERS */
+	ENTER();
-
+
-	result = __putc_unlocked(c,stdout);
+	if(__directory_list.mlh_Head != NULL)
-
+	{
- out:
+		while(NOT IsListEmpty((struct List *)&__directory_list))
-
+			closedir((DIR *)__directory_list.mlh_Head);
-	return(result);
+	}
+
+	LEAVE();
 }

library/dirent_headers.h

@@ -1,10 +1,10 @@
 /*
- * $Id: dirent_headers.h,v 1.7 2005-02-28 10:07:30 obarthel Exp $
+ * $Id: dirent_headers.h,v 1.2 2004-10-24 20:03:42 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,12 +42,6 @@
 
 /****************************************************************************/
 
-#ifndef _STDLIB_HEADERS_H
-#include "stdlib_headers.h"
-#endif /* _STDLIB_HEADERS_H */
-
-/****************************************************************************/
-
 #ifndef _MACROS_H
 #include "macros.h"
 #endif /* _MACROS_H */
@@ -60,10 +54,9 @@ struct DirectoryHandle
 	BPTR					dh_DirLock;
 	struct FileInfoBlock	dh_FileInfo;
 	struct dirent			dh_DirectoryEntry;
-
 	int						dh_Position;
 	struct Node *			dh_VolumeNode;
-	struct MinList			dh_VolumeList;
+	struct List				dh_VolumeList;
 	BOOL					dh_ScanVolumeList;
 };
 
@@ -73,26 +66,4 @@ extern struct MinList NOCOMMON __directory_list;
 
 /****************************************************************************/
 
-#if defined(__THREAD_SAFE)
-
-/****************************************************************************/
-
-extern void __dirent_lock(void);
-extern void __dirent_unlock(void);
-
-/****************************************************************************/
-
-#else
-
-/****************************************************************************/
-
-#define __dirent_lock()		((void)0)
-#define __dirent_unlock()	((void)0)
-
-/****************************************************************************/
-
-#endif /* __THREAD_SAFE */
-
-/****************************************************************************/
-
 #endif /* _DIRENT_HEADERS_H */

library/dirent_opendir.c

@@ -1,10 +1,10 @@
 /*
- * $Id: dirent_opendir.c,v 1.8 2005-02-27 21:58:21 obarthel Exp $
+ * $Id: dirent_opendir.c,v 1.2 2004-08-07 09:15:32 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,7 @@
 
 /****************************************************************************/
 
-STATIC struct Node *
+static struct Node *
 find_by_name(struct List * list,const char * name)
 {
 	struct Node * result = NULL;
@@ -89,6 +89,7 @@ opendir(const char * path_name)
 	#endif /* UNIX_PATH_SEMANTICS */
 	struct DirectoryHandle * dh = NULL;
 	DIR * result = NULL;
+	struct Node * node;
 
 	ENTER();
 
@@ -105,7 +106,7 @@ opendir(const char * path_name)
 		{
 			SHOWMSG("invalid parameter");
 
-			__set_errno(EFAULT);
+			errno = EFAULT;
 			goto out;
 		}
 	}
@@ -120,12 +121,10 @@ opendir(const char * path_name)
 
 	memset(dh,0,sizeof(*dh));
 
+	NewList(&dh->dh_VolumeList);
+
 	#if defined(UNIX_PATH_SEMANTICS)
 	{
-		struct Node * node;
-
-		NewList((struct List *)&dh->dh_VolumeList);
-
 		if(__unix_path_semantics)
 		{
 			if(__translate_unix_to_amiga_path_name(&path_name,&path_name_nti) != 0)
@@ -160,7 +159,7 @@ opendir(const char * path_name)
 						{
 							UnLockDosList(LDF_VOLUMES|LDF_READ);
 
-							__set_errno(ENOMEM);
+							errno = ENOMEM;
 							goto out;
 						}
 
@@ -173,7 +172,7 @@ opendir(const char * path_name)
 						/* Check if the name is already on the list. Mind you,
 						   this is not the most sophisticated algorithm but then
 						   the number of volumes should be small. */
-						if(find_by_name((struct List *)&dh->dh_VolumeList,node->ln_Name) != NULL)
+						if(find_by_name(&dh->dh_VolumeList,node->ln_Name) != NULL)
 						{
 							free(node);
 							continue;
@@ -181,16 +180,16 @@ opendir(const char * path_name)
 
 						D(("adding '%s'",node->ln_Name));
 
-						AddTail((struct List *)&dh->dh_VolumeList,node);
+						AddTail(&dh->dh_VolumeList,node);
 					}
 				}
 
 				UnLockDosList(LDF_VOLUMES|LDF_READ);
 
 				/* Bail out if we cannot present anything. */
-				if(IsListEmpty((struct List *)&dh->dh_VolumeList))
+				if(IsListEmpty(&dh->dh_VolumeList))
 				{
-					__set_errno(ENOMEM);
+					errno = ENOMEM;
 					goto out;
 				}
 			}
@@ -213,7 +212,7 @@ opendir(const char * path_name)
 		{
 			SHOWMSG("couldn't get a lock on it");
 
-			__set_errno(__translate_access_io_error_to_errno(IoErr()));
+			__translate_access_io_error_to_errno(IoErr(),&errno);
 			goto out;
 		}
 
@@ -227,7 +226,7 @@ opendir(const char * path_name)
 		{
 			SHOWMSG("couldn't examine it");
 
-			__set_errno(__translate_io_error_to_errno(IoErr()));
+			__translate_io_error_to_errno(IoErr(),&errno);
 			goto out;
 		}
 
@@ -235,7 +234,7 @@ opendir(const char * path_name)
 		{
 			SHOWMSG("this isn't a directory");
 
-			__set_errno(ENOTDIR);
+			errno = ENOTDIR;
 			goto out;
 		}
 	}
@@ -244,12 +243,8 @@ opendir(const char * path_name)
 
 	assert( __directory_list.mlh_Head != NULL );
 
-	__dirent_lock();
-
 	AddTail((struct List *)&__directory_list,(struct Node *)dh);
 
-	__dirent_unlock();
-
 	result = (DIR *)dh;
 	dh = NULL;
 
@@ -259,14 +254,8 @@ opendir(const char * path_name)
 	{
 		SHOWMSG("ouch. cleaning up");
 
-		#if defined(UNIX_PATH_SEMANTICS)
+		while((node = RemHead(&dh->dh_VolumeList)) != NULL)
-		{
+			free(node);
-			struct Node * node;
-
-			while((node = RemHead((struct List *)&dh->dh_VolumeList)) != NULL)
-				free(node);
-		}
-		#endif /* UNIX_PATH_SEMANTICS */
 
 		PROFILE_OFF();
 		UnLock(dh->dh_DirLock);