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

git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/tags/V1_180@14757 87f5fb63-7c3d-0410-a384-fd976d0f7a62
2025-12-08 14:59:05 +00:00 · 2004-10-23 16:38:19 +00:00
78 changed files with 909 additions and 2257 deletions
--- a/library/GNUmakefile.68k
+++ b/library/GNUmakefile.68k
@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.68k,v 1.17 2004-11-18 09:40:37 obarthel Exp $
+# $Id: GNUmakefile.68k,v 1.11 2004-10-07 09:20:44 obarthel Exp $
 #
 # :ts=8
 #
@@ -9,7 +9,7 @@
 CC = gcc
 AR = ar -q
 RANLIB = ranlib
-COPY = copy clone buf=0
+COPY = copy clone
 DELETE = delete all quiet
 MAKEDIR = makedir
 MAKE = make -f GNUmakefile.68k
@@ -106,7 +106,7 @@ INCLUDES = -Iinclude -I. -Inetinclude
 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 = -O
 #OPTIMIZE = -O2 -fomit-frame-pointer
 #DEBUG = -g2

@@ -286,10 +286,6 @@ C_LIB = \
 	stdlib_modsi3.o \
 	stdlib_mulsi3.o \
 	stdlib_never_free.o \
-	stdlib_osliberror.o \
-	stdlib_oslibversion.o \
-	stdlib_priority.o \
-	stdlib_process_name.o \
 	stdlib_putenv.o \
 	stdlib_qsort.o \
 	stdlib_rand.o \
@@ -322,7 +318,6 @@ C_LIB = \
 	stdlib_umodsi3.o \
 	stdlib_unsetenv.o \
 	stdlib_wildcard_expand.o \
-	stdlib_stdio_window_spec.o \
 	strings_strcasecmp.o \
 	strings_strncasecmp.o \
 	string_bcmp.o \
@@ -343,8 +338,6 @@ C_LIB = \
 	string_strcspn.o \
 	string_strdup.o \
 	string_strerror.o \
-	string_strlcat.o \
-	string_strlcpy.o \
 	string_strlen.o \
 	string_strncat.o \
 	string_strncmp.o \
@@ -354,20 +347,15 @@ C_LIB = \
 	string_strspn.o \
 	string_strstr.o \
 	string_strtok.o \
-	string_strtok_r.o \
 	string_strxfrm.o \
 	time_asctime.o \
-	time_asctime_r.o \
 	time_clock.o \
 	time_converttime.o \
 	time_ctime.o \
-	time_ctime_r.o \
 	time_data.o \
 	time_gettimeofday.o \
 	time_gmtime.o \
-	time_gmtime_r.o \
 	time_localtime.o \
-	time_localtime_r.o \
 	time_mktime.o \
 	time_numbertostring.o \
 	time_strftime.o \
@@ -499,6 +487,7 @@ MATH_LIB = \
 	stdio_vasprintf.o \
 	stdio_vfprintf.o \
 	stdio_vfscanf.o \
+	stdio_vfscanf.o \
 	stdio_vprintf.o \
 	stdio_vsnprintf.o \
 	stdio_vsprintf.o \
@@ -689,7 +678,6 @@ AMIGA_LIB = \
 	amiga_newlist.o \
 	amiga_rangerand.o \
 	amiga_remtof.o \
-	amiga_rexxvars.o \
 	amiga_setsuperattrs.o \
 	amiga_timedelay.o \
 	amiga_waitbeam.o
@@ -699,7 +687,8 @@ AMIGA_LIB = \
 LIBS_68K := $(LIBC_OBJS)/libc.a $(LIBSTACK_OBJS)/libstack.a $(LIBUNIX_OBJS)/libunix.a \
            $(LIBNET_OBJS)/libnet.a $(LIBDEBUG_OBJS)/libdebug.a $(LIBAMIGA_OBJS)/libamiga.a \
            $(LIBM_OBJS)/libm.a
-LIBS_020 := $(LIBM881_OBJS)/libm881.a $(LIBS_68K)
+ LIBS_020 := $(LIBM881_OBJS)/libm881.a $(LIBS_68K)
+#LIBS_020 := $(LIBS_68K)

 ##############################################################################

@@ -725,8 +714,8 @@ all: \
 	lib/mainnb.o \
 	lib/mainb.o \
 	lib/mainb32.o \
-	lib/libm020/libm.a \
 	lib/libm.a \
+	lib/libm020/libm.a \
 	lib/libb/libm.a \
 	lib/libb/libm020/libm.a \
 	lib/libb32/libm020/libm.a
@@ -998,3 +987,28 @@ mainb.o : stdlib_main.c

 mainnb.o : stdlib_main.c
 	$(CC) -o mainnb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -m68000 stdlib_main.c
+
+##############################################################################
+
+#test: test.o ncrt0.o libc.a libunix.a libm.a libdebug.a libamiga.a
+#	$(CC) -Wl,--verbose $(CFLAGS) -DIEEE_FLOATING_POINT_SUPPORT \
+#		-o $@ -nostdlib ncrt0.o test.o -L. -lm -lunix -ldebug -lc -lamiga
+
+#test: test.o ncrt0.o nbcrt0.o nrcrt0.o libc.a libunix.a libm.a libdebug.a libamiga.a
+#	$(CC) -resident -Wl,--verbose $(CFLAGS) -DIEEE_FLOATING_POINT_SUPPORT -fbaserel32 -DSMALL_DATA \
+#		-o $@ -nostdlib nbcrt0.o test.o -L. -lm -lunix -ldebug -lc -lamiga
+
+test : test.c
+	gcc -o test test.c -D__MEM_DEBUG -DFLOATING_POINT_SUPPORT -Llib -lunix -lm
+
+#test: test.o ncrt0.o nbcrt0.o nrcrt0.o libc.a libunix.a libm.a libdebug.a libamiga.a
+#	$(CC) -resident -Wl,--verbose $(CFLAGS) -DIEEE_FLOATING_POINT_SUPPORT -fbaserel -DSMALL_DATA \
+#		-o $@ -nostdlib nrcrt0.o test.o -L. -lm -lunix -ldebug -lc -lamiga
+
+##############################################################################
+
+mkid:
+	mkid -v #?.(c|h|asm|i) include/#?.(c|h|asm|i) include/sys/#?.(c|h|asm|i)
+
+update:
+	mkid -v -u
--- a/library/GNUmakefile.os4
+++ b/library/GNUmakefile.os4
@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.os4,v 1.15 2004-11-18 09:40:37 obarthel Exp $
+# $Id: GNUmakefile.os4,v 1.12 2004-10-07 11:03:46 tfrieden Exp $
 #
 # :ts=8
 #
@@ -35,6 +35,7 @@ ifeq (,$(TYPE))
 LIBC_OBJS	= libc_objs
 LIBUNIX_OBJS	= libunix_objs
 LIBM_OBJS	= libm_objs
+LIBSTACK_OBJS	= libstack_objs
 LIBNET_OBJS	= libnet_objs
 LIBDEBUG_OBJS	= libdebug_objs
 LIBAMIGA_OBJS	= libamiga_objs
@@ -42,6 +43,7 @@ else
 LIBC_OBJS	= $(TYPE)/libc_objs
 LIBUNIX_OBJS	= $(TYPE)/libunix_objs
 LIBM_OBJS	= $(TYPE)/libm_objs
+LIBSTACK_OBJS	= $(TYPE)/libstack_objs
 LIBNET_OBJS	= $(TYPE)/libnet_objs
 LIBDEBUG_OBJS	= $(TYPE)/libdebug_objs
 LIBAMIGA_OBJS	= $(TYPE)/libamiga_objs
@@ -49,7 +51,6 @@ endif

 ##############################################################################

-# General build rules for all object files and the individual libraries
 %.o : %.c
 	@echo "Compiling $<"
 	@$(CC) -c $(CFLAGS) $<
@@ -66,6 +67,10 @@ $(LIBM_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):m]"
 	@$(CC) -o $(LIBM_OBJS)/$*.o -c $(CFLAGS) $(FLOAT_TYPE) $<

+$(LIBSTACK_OBJS)/%.o : %.c
+	@echo "Compiling $< [$(TYPE):stack]"
+	@$(CC) -o $(LIBSTACK_OBJS)/$*.o -c $(CFLAGS) $<
+
 $(LIBNET_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):net]"
 	@$(CC) -o $(LIBNET_OBJS)/$*.o -c $(CFLAGS) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT $<
@@ -80,7 +85,6 @@ $(LIBAMIGA_OBJS)/%.o : %.c

 ##############################################################################

-# Build options for the individual libraries
 ifeq (small_data,$(TYPE))
 CODE_TYPE := -msdata=sysv -DSMALL_DATA
 FLOAT_TYPE := -DPPC_FLOATING_POINT_SUPPORT
@@ -91,7 +95,7 @@ CODE_TYPE := -msdata=data
 FLOAT_TYPE := -DPPC_FLOATING_POINT_SUPPORT
 endif

-ifeq (large_data_softfloat,$(TYPE))
+ifeq (large_data_softfloat, $(TYPE))
 CODE_TYPE := -msdata=data -msoft-float
 FLOAT_TYPE :=
 endif
@@ -103,7 +107,7 @@ WARNINGS = \
 	-Wundef -Wbad-function-cast -Wmissing-declarations -Wconversion

 INCLUDES = -Iinclude -I. -I$(SDK_INCLUDE)
-OPTIONS = -DNDEBUG -DUSE_64_BIT_INTS -D__USE_INLINE__ -Wa,-mregnames
+OPTIONS = -DNDEBUG -DUSE_64_BIT_INTS -fno-builtin -D__USE_INLINE__ -Wa,-mregnames
 OPTIMIZE = -O -fomit-frame-pointer -funroll-loops
 #DEBUG = -g

@@ -111,7 +115,6 @@ CFLAGS = $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(CODE_TYPE) $(INCLUDES)

 ##############################################################################

-# All objects files which make up libc.a
 C_LIB = \
 	c.lib_rev.o \
 	ctype_isalnum.o \
@@ -131,9 +134,9 @@ C_LIB = \
 	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 \
@@ -252,42 +255,41 @@ C_LIB = \
 	stdlib_atol.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 \
-	stdlib_detach.o \
 	stdlib_disablerequesters.o \
 	stdlib_div.o \
+	stdlib_modsi3.o \
 	stdlib_divsi3.o \
 	stdlib_divsi4.o \
-	stdlib_dosbase.o \
+	stdlib_umodsi3.o \
+	stdlib_udivsi3.o \
+	stdlib_udivsi4.o \
 	stdlib_exit.o \
 	stdlib_free.o \
-	stdlib_getdefstacksize.o \
 	stdlib_getenv.o \
 	stdlib_getsp.o \
 	stdlib_init_exit.o \
-	stdlib_isresident.o \
 	stdlib_labs.o \
 	stdlib_ldiv.o \
+	stdlib_getdefstacksize.o \
+	stdlib_stackargbytes.o \
+	stdlib_stack_usage.o \
+	stdlib_checkdetach.o \
+	stdlib_detach.o \
+	stdlib_isresident.o \
+	stdlib_sysbase.o \
+	stdlib_dosbase.o \
 	stdlib_machine_test.o \
 	stdlib_malloc.o \
 	stdlib_math.o \
 	stdlib_mkdtemp.o \
 	stdlib_mkstemp.o \
 	stdlib_mktemp.o \
-	stdlib_modsi3.o \
 	stdlib_mulsi3.o \
 	stdlib_never_free.o \
-	stdlib_osliberror.o \
-	stdlib_oslibversion.o \
-	stdlib_priority.o \
-	stdlib_process_name.o \
 	stdlib_putenv.o \
 	stdlib_qsort.o \
 	stdlib_rand.o \
@@ -299,28 +301,21 @@ C_LIB = \
 	stdlib_showerror.o \
 	stdlib_socket.o \
 	stdlib_srand.o \
-	stdlib_stackargbytes.o \
 	stdlib_stackcheck.o \
 	stdlib_stackoverflow.o \
 	stdlib_stacksafezone.o \
 	stdlib_stacksize.o \
-	stdlib_stack_usage.o \
 	stdlib_startup.o \
 	stdlib_strtol.o \
 	stdlib_strtoul.o \
 	stdlib_strtoll.o \
 	stdlib_strtoull.o \
 	stdlib_swapstack.o \
-	stdlib_sysbase.o \
 	stdlib_system.o \
 	stdlib_termination_message.o \
 	stdlib_threshold.o \
-	stdlib_udivsi3.o \
-	stdlib_udivsi4.o \
-	stdlib_umodsi3.o \
 	stdlib_unsetenv.o \
 	stdlib_wildcard_expand.o \
-	stdlib_stdio_window_spec.o \
 	strings_strcasecmp.o \
 	strings_strncasecmp.o \
 	string_bcmp.o \
@@ -341,8 +336,6 @@ C_LIB = \
 	string_strcspn.o \
 	string_strdup.o \
 	string_strerror.o \
-	string_strlcat.o \
-	string_strlcpy.o \
 	string_strlen.o \
 	string_strncat.o \
 	string_strncmp.o \
@@ -352,20 +345,15 @@ C_LIB = \
 	string_strspn.o \
 	string_strstr.o \
 	string_strtok.o \
-	string_strtok_r.o \
 	string_strxfrm.o \
 	time_asctime.o \
-	time_asctime_r.o \
 	time_clock.o \
 	time_converttime.o \
 	time_ctime.o \
-	time_ctime_r.o \
 	time_data.o \
 	time_gettimeofday.o \
 	time_gmtime.o \
-	time_gmtime_r.o \
 	time_localtime.o \
-	time_localtime_r.o \
 	time_mktime.o \
 	time_numbertostring.o \
 	time_strftime.o \
@@ -392,21 +380,21 @@ C_LIB = \
 	unistd_realpath.o \
 	unistd_sleep.o \
 	unistd_symlink.o \
-	unistd_timer.o \
 	unistd_time_delay.o \
+	unistd_timer.o \
 	unistd_truncate.o \
 	unistd_unlink.o \
 	unistd_usleep.o \
 	utime_utime.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 \
+	dirent_rewinddir.o \
 	fcntl_creat.o \
 	fcntl_fcntl.o \
 	fcntl_open.o \
@@ -420,12 +408,12 @@ UNIX_LIB = \
 	stat_rmdir.o \
 	stat_stat.o \
 	stdio_fdhookentry.o \
-	stdio_fflush.o \
-	stdio_fopen.o \
-	stdio_fopen.o \
 	stdio_init_exit.o \
 	stdio_locksemaphorename.o \
 	stdio_openiob.o \
+	stdio_fflush.o \
+	stdio_fopen.o \
+	stdio_fopen.o \
 	stdio_popen.o \
 	stdio_remove.o \
 	stdio_rename.o \
@@ -455,7 +443,6 @@ UNIX_LIB = \
 	unistd_wildcard_expand.o \
 	utime_utime.o

-# All objects files which make up libm.a
 MATH_LIB = \
 	math_acos.o \
 	math_asin.o \
@@ -505,6 +492,7 @@ MATH_LIB = \
 	stdio_vasprintf.o \
 	stdio_vfprintf.o \
 	stdio_vfscanf.o \
+	stdio_vfscanf.o \
 	stdio_vprintf.o \
 	stdio_vsnprintf.o \
 	stdio_vsprintf.o \
@@ -513,7 +501,48 @@ MATH_LIB = \
 	stdlib_strtod.o \
 	time_difftime.o

-# All objects files which make up libnet.a
+MATH_LIB_IEEE = \
+	m.lib_rev.o \
+	$(MATH_LIB) \
+	math_adddf3.o \
+	math_addsf3.o \
+	math_divdf3.o \
+	math_divsf3.o \
+	math_eqdf2.o \
+	math_eqsf2.o \
+	math_extendsfdf2.o \
+	math_fixdfsi.o \
+	math_fixsfsi.o \
+	math_fixunsdfsi.o \
+	math_fixunssfsi.o \
+	math_floatsidf.o \
+	math_floatsisf.o \
+	math_gedf2.o \
+	math_gesf2.o \
+	math_gtdf2.o \
+	math_gtsf2.o \
+	math_ledf2.o \
+	math_lesf2.o \
+	math_ltdf2.o \
+	math_ltsf2.o \
+	math_muldf3.o \
+	math_mulsf3.o \
+	math_nedf2.o \
+	math_negdf2.o \
+	math_negsf2.o \
+	math_nesf2.o \
+	math_subdf3.o \
+	math_subsf3.o \
+	math_truncdfsf2.o
+
+STACK_LIB = \
+	stack.lib_rev.o \
+	stdlib_setjmp.o \
+	stdlib_stackextension.o \
+	stdlib_stackminframe.o \
+	stdlib_stackoverflow.o \
+	stdlib_stacksafezone.o
+
 NET_LIB = \
 	net.lib_rev.o \
 	socket_accept.o \
@@ -557,7 +586,6 @@ NET_LIB = \
 	socket_socket.o \
 	socket_hook_entry.o \
 	socket_hstrerror.o \
-	stat_umask.o \
 	usergroup_crypt.o \
 	usergroup_data.o \
 	usergroup_endgrent.o \
@@ -586,12 +614,13 @@ NET_LIB = \
 	usergroup_setregid.o \
 	usergroup_setreuid.o \
 	usergroup_setsid.o \
-	usergroup_setuid.o
+	usergroup_setuid.o \
+	stat_umask.o

-# All objects files which make up libdebug.a
 DEBUG_LIB = \
 	debug.lib_rev.o \
 	debug.o \
+	debug_level.o \
 	debug_cmpstrexec.o \
 	debug_kcmpstr.o \
 	debug_kdofmt.o \
@@ -617,10 +646,8 @@ DEBUG_LIB = \
 	debug_kputstr1.o \
 	debug_kputstr2.o \
 	debug_kvprintf1.o \
-	debug_kvprintf2.o \
-	debug_level.o
+	debug_kvprintf2.o

-# All objects files which make up libamiga.a
 AMIGA_LIB = \
 	amiga.lib_rev.o \
 	amiga_acrypt.o \
@@ -629,17 +656,10 @@ AMIGA_LIB = \
 	amiga_argarrayinit.o \
 	amiga_argint.o \
 	amiga_argstring.o \
-	amiga_beginio.o \
 	amiga_callhooka.o \
 	amiga_coercemethod.o \
-	amiga_createextio.o \
-	amiga_createport.o \
 	amiga_createstdio.o \
-	amiga_createtask.o \
-	amiga_deleteextio.o \
-	amiga_deleteport.o \
 	amiga_deletestdio.o \
-	amiga_deletetask.o \
 	amiga_domethod.o \
 	amiga_dosupermethod.o \
 	amiga_dotimer.o \
@@ -647,62 +667,54 @@ AMIGA_LIB = \
 	amiga_freeievents.o \
 	amiga_hotkey.o \
 	amiga_invertstring.o \
-	amiga_newlist.o \
 	amiga_rangerand.o \
 	amiga_remtof.o \
-	amiga_rexxvars.o \
 	amiga_setsuperattrs.o \
 	amiga_timedelay.o \
 	amiga_waitbeam.o 

 ##############################################################################

-# The libraries to be built, prefixed by the respective path names
-LIBS := \
-	$(LIBC_OBJS)/libc.a \
-	$(LIBUNIX_OBJS)/libunix.a \
-	$(LIBDEBUG_OBJS)/libdebug.a \
-	$(LIBAMIGA_OBJS)/libamiga.a \
-	$(LIBM_OBJS)/libm.a \
-	$(LIBNET_OBJS)/libnet.a
+LIBS := $(LIBC_OBJS)/libc.a $(LIBSTACK_OBJS)/libstack.a $(LIBUNIX_OBJS)/libunix.a \
+            $(LIBDEBUG_OBJS)/libdebug.a $(LIBAMIGA_OBJS)/libamiga.a \
+            $(LIBM_OBJS)/libm.a $(LIBNET_OBJS)/libnet.a

 ##############################################################################

-# The startup object files to be built
-STARTUPS := bcrt0.o bcrtbegin.o bcrtend.o crt0.o crtbegin.o crtend.o mainb.o mainnb.o

 ##############################################################################

-# This is the first target: it creates the necessary directories, then proceeds
-# to build the startup object files and finally the libraries
+STARTUPS := crt0.o crtbegin.o crtend.o mainnb.o
+
+##############################################################################
+
 all: \
-	lib \
-	lib/soft-float \
-	lib/small-data \
-	small_data \
-	large_data \
-	large_data_softfloat \
-	lib/bcrt0.o \
-	lib/bcrtbegin.o \
-	lib/bcrtend.o \
 	lib/crt0.o \
 	lib/crtbegin.o \
 	lib/crtend.o \
-	lib/mainb.o \
 	lib/mainnb.o \
 	lib/libm.a \
 	lib/small-data/libm.a \
-	lib/soft-float/libm.a
+	lib/bcrt0.o \
+	lib/bcrtbegin.o \
+	lib/bcrtend.o \
+	lib/soft-float/libc.a
+
+copy:
+	$(COPY) $(foreach file,$(LIBS),large_data/$(file)) lib

 ##############################################################################

-# Delete all object files and libraries
 clean:
-	-$(DELETE) $(STARTUPS) lib small_data large_data large_data_softfloat
+	-$(DELETE) $(TYPE)  $(STARTUPS) \
+		$(LIBC_OBJS) $(LIBUNIX_OBJS) $(LIBM_OBJS) $(LIBSTACK_OBJS) $(LIBNET_OBJS) $(LIBDEBUG_OBJS) $(LIBAMIGA_OBJS)
+
+realclean:
+	$(MAKE) clean
+	-$(DELETE) lib small_data large_data large_data_softfloat

 ##############################################################################

-# Update the version numbers bound to the individual libraries
 version:
 	cp c.lib_rev.rev amiga.lib_rev.rev
 	cp c.lib_rev.rev debug.lib_rev.rev
@@ -722,74 +734,43 @@ version:

 ##############################################################################

-# Tag all files with a certain version number
 cvs-tag:
 	cvs -q tag V1_`cat c.lib_rev.rev`

 ##############################################################################

-# This target first creates a directory to store the object files in, then
-# proceeds to build the libraries from the code. It is invoked by the
-# individual library build targets below.
-all_libraries: $(TYPE) $(LIBS)
+kitchen_sink: $(TYPE) $(LIBS) $(STARTUPS)
+
+##############################################################################
+
+ifneq (,$(TYPE))
+$(TYPE):
+	$(MAKEDIR) $@
+endif

 ##############################################################################

-# These create the required subdirectories to store object files and
-# libraries in
 lib:
 	-$(MAKEDIR) $@

-lib/small-data: lib
+lib/small-data:
 	-$(MAKEDIR) $@

-lib/soft-float: lib
+lib/soft-float:
 	-$(MAKEDIR) $@

-small_data:
-	-$(MAKEDIR) $@
-
-large_data:
-	-$(MAKEDIR) $@
-
-large_data_softfloat:
-	-$(MAKEDIR) $@
-
-##############################################################################
-
-# Dependencies for libm.a (large data variant with hardware floating point code
-# support): this actually ends up building all the libraries rather than just
-# libm.a
-lib/libm.a: large_data large_data/libm.a
-
-large_data/libm.a:
-	$(MAKE) TYPE=large_data all_libraries
+lib/libm.a: lib
+	$(MAKE) TYPE=large_data kitchen_sink
 	$(COPY) $(foreach file,$(LIBS),large_data/$(file)) lib

-##############################################################################
-
-# Dependencies for libm.a (large data variant with software floating point code
-# support): this actually ends up building all the libraries rather than just
-# libm.a
-lib/soft-float/libm.a: large_data_softfloat large_data_softfloat/libm.a
-
-large_data_softfloat/libm.a:
-	$(MAKE) TYPE=large_data_softfloat all_libraries
-	$(COPY) $(foreach file,$(LIBS),large_data_softfloat/$(file)) lib/soft-float
-
-##############################################################################
-
-# Dependencies for libm.a (small data variant): this actually ends up building all
-# the libraries rather than just libm.a
-lib/small-data/libm.a: small_data small_data/libm.a
-
-small_data/libm.a:
-	$(MAKE) TYPE=small_data all_libraries
+lib/small-data/libm.a: lib lib/small-data
+	$(MAKE) TYPE=small_data kitchen_sink
 	$(COPY) $(foreach file,$(LIBS),small_data/$(file)) lib/small-data

-##############################################################################
+lib/soft-float/libc.a: lib lib/soft-float
+	$(MAKE) TYPE=large_data_softfloat kitchen_sink
+	$(COPY) $(foreach file,$(LIBS),large_data_softfloat/$(file)) lib/soft-float

-# Rules to build and move the startup code
 lib/crt0.o : lib crt0.o
 	$(COPY) crt0.o lib

@@ -816,35 +797,22 @@ lib/bcrtend.o : lib bcrtend.o
 	
 ##############################################################################

-# Individual dependencies which tell make to build the object files from
-# 'C' source files rather than the assembly language source files of the
-# same name (e.g. stdlib_getsp.c instead of stdlib_getsp.asm).
+$(LIBAMIGA_OBJS)/amiga_hookentry.o : amiga_hookentry.c
+
 $(LIBC_OBJS)/stdlib_getsp.o : stdlib_getsp.c

 $(LIBC_OBJS)/stdlib_swapstack.o : stdlib_swapstack.c

 $(LIBC_OBJS)/stdlib_setjmp.o : stdlib_setjmp.c

-##############################################################################
-
-# Build rules for version information that goes into each library
-$(LIBC_OBJS)/c.lib_rev.o : c.lib_rev.c c.lib_rev.h
-
-$(LIBUNIX_OBJS)/unix.lib_rev.o : unix.lib_rev.c unix.lib_rev.h
-
-$(LIBM_OBJS)/m.lib_rev.o : m.lib_rev.c m.lib_rev.h
-
-$(LIBNET_OBJS)/net.lib_rev.o : net.lib_rev.c net.lib_rev.h
-
-$(LIBDEBUG_OBJS)/debug.lib_rev.o : debug.lib_rev.c debug.lib_rev.h
-
-$(LIBAMIGA_OBJS)/amiga.lib_rev.o : amiga.lib_rev.c amiga.lib_rev.h
+$(LIBSTACK_OBJS)/stdlib_setjmp.o : stdlib_setjmp.c

 ##############################################################################

-# Build rules for the debug version of the library which has special
-# memory allocation debugging code, controlled by the contents of
-# the stdlib_mem_debug.h file.
+$(LIBC_OBJS)/stdlib_stacksize.o : stdlib_stacksize.c stdlib_gcc_help.h
+
+$(LIBC_OBJS)/stdlib_shell_escape.o : stdlib_shell_escape.c stdlib_gcc_help.h
+
 $(LIBC_OBJS)/stdlib_alloca.o : stdlib_alloca.c stdlib_mem_debug.h

 $(LIBC_OBJS)/stdlib_calloc.o : stdlib_calloc.c stdlib_mem_debug.h
@@ -861,7 +829,6 @@ $(LIBC_OBJS)/stdlib_red_black.o : stdlib_red_black.c stdlib_mem_debug.h

 ##############################################################################

-# Individual build rules for libc.a
 $(LIBC_OBJS) :
 	$(MAKEDIR) $@

@@ -872,7 +839,6 @@ $(LIBC_OBJS)/libc.a : $(LIBC_OBJS) $(foreach file,$(C_LIB),$(LIBC_OBJS)/$(file))

 ##############################################################################

-# Individual build rules for libunix.a
 $(LIBUNIX_OBJS) :
 	$(MAKEDIR) $@

@@ -883,18 +849,26 @@ $(LIBUNIX_OBJS)/libunix.a : $(LIBUNIX_OBJS) $(foreach file,$(UNIX_LIB),$(LIBUNIX

 ##############################################################################

-# Individual build rules for libm.a
 $(LIBM_OBJS) :
 	$(MAKEDIR) $@

-$(LIBM_OBJS)/libm.a : $(LIBM_OBJS) $(foreach file,$(MATH_LIB),$(LIBM_OBJS)/$(file))
+$(LIBM_OBJS)/libm.a : $(LIBM_OBJS) $(foreach file,$(MATH_LIB_IEEE),$(LIBM_OBJS)/$(file))
 	-$(DELETE) $@
-	@$(AR) $@ $(foreach file,$(MATH_LIB),$(LIBM_OBJS)/$(file))
+	@$(AR) $@ $(foreach file,$(MATH_LIB_IEEE),$(LIBM_OBJS)/$(file))
+	$(RANLIB) $@
+
+##############################################################################
+
+$(LIBSTACK_OBJS) :
+	$(MAKEDIR) $@
+
+$(LIBSTACK_OBJS)/libstack.a : $(LIBSTACK_OBJS) $(foreach file,$(STACK_LIB),$(LIBSTACK_OBJS)/$(file))
+	-$(DELETE) $@
+	@$(AR) $@ $(foreach file,$(STACK_LIB),$(LIBSTACK_OBJS)/$(file))
 	$(RANLIB) $@

 ##############################################################################

-# Individual build rules for libnet.a
 $(LIBNET_OBJS) :
 	$(MAKEDIR) $@

@@ -905,7 +879,6 @@ $(LIBNET_OBJS)/libnet.a : $(LIBNET_OBJS) $(foreach file,$(NET_LIB),$(LIBNET_OBJS

 ##############################################################################

-# Individual build rules for libdebug.a
 $(LIBDEBUG_OBJS) :
 	$(MAKEDIR) $@

@@ -916,7 +889,6 @@ $(LIBDEBUG_OBJS)/libdebug.a : $(LIBDEBUG_OBJS) $(foreach file,$(DEBUG_LIB),$(LIB

 ##############################################################################

-# Individual build rules for libamiga.a
 $(LIBAMIGA_OBJS) :
 	$(MAKEDIR) $@

@@ -927,7 +899,6 @@ $(LIBAMIGA_OBJS)/libamiga.a : $(LIBAMIGA_OBJS) $(foreach file,$(AMIGA_LIB),$(LIB

 ##############################################################################

-# Individual build rules for the startup code.
 crt0.o : crt0.S
 	@echo "Assembling $<"
 	@$(CC) -Wa,-mregnames -o crt0.o -c crt0.S
@@ -949,3 +920,13 @@ bcrtbegin.o : crtbegin.c

 bcrtend.o : crtend.c
 	$(CC) -o bcrtend.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtend.c 
+
+
+##############################################################################
+
+mkid:
+#	mkid -v #?.(c|h|asm|i) include/#?.(c|h|asm|i) include/sys/#?.(c|h|asm|i)
+	mkid *.[ch] include/*.h include/sys/*.h
+
+update:
+	mkid -v -u
--- a/library/amiga.lib_rev.h
+++ b/library/amiga.lib_rev.h
@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	184
-#define DATE		"28.11.2004"
-#define VERS		"amiga.lib 1.184"
-#define VSTRING		"amiga.lib 1.184 (28.11.2004)\r\n"
-#define VERSTAG		"\0$VER: amiga.lib 1.184 (28.11.2004)"
+#define REVISION	180
+#define DATE		"23.10.2004"
+#define VERS		"amiga.lib 1.180"
+#define VSTRING		"amiga.lib 1.180 (23.10.2004)\r\n"
+#define VERSTAG		"\0$VER: amiga.lib 1.180 (23.10.2004)"
--- a/library/amiga.lib_rev.rev
+++ b/library/amiga.lib_rev.rev
@@ -1 +1 @@
-184
+180
--- a/library/amiga_beginio.c
+++ b/library/amiga_beginio.c
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_beginio.c,v 1.2 2004-11-13 12:55:39 obarthel Exp $
+ * $Id: amiga_beginio.c,v 1.1.1.1 2004-07-26 16:30:17 obarthel Exp $
 *
 * :ts=4
 *
@@ -37,14 +37,6 @@

 /****************************************************************************/

-#include "debug.h"
-
-/****************************************************************************/
-
-#ifndef __PPC__
-
-/****************************************************************************/
-
 #if defined(__SASC)

 VOID __begin_io(struct IORequest * ior);
@@ -72,6 +64,10 @@ VOID __begin_io(struct IORequest * ior);

 /****************************************************************************/

+#include "debug.h"
+
+/****************************************************************************/
+
 VOID
 BeginIO(struct IORequest *ior)
 {
@@ -86,35 +82,3 @@ BeginIO(struct IORequest *ior)

 	LEAVE();
 }
-
-/****************************************************************************/
-
-#else
-
-/****************************************************************************/
-
-#include <proto/exec.h>
-
-/****************************************************************************/
-
-#if defined(BeginIO)
-#undef BeginIO
-#endif /* BeginIO */
-
-/****************************************************************************/
-
-VOID
-BeginIO(struct IORequest *ior)
-{
-	ENTER();
-
-	assert( ior != NULL && ior->io_Device != NULL );
-
-	IExec->BeginIO(ior);
-
-	LEAVE();
-}
-
-/****************************************************************************/
-
-#endif /* __PPC__ */
--- a/library/amiga_createextio.c
+++ b/library/amiga_createextio.c
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_createextio.c,v 1.2 2004-11-10 14:55:30 obarthel Exp $
+ * $Id: amiga_createextio.c,v 1.1.1.1 2004-07-26 16:30:18 obarthel Exp $
 *
 * :ts=4
 *
@@ -44,12 +44,6 @@

 /****************************************************************************/

-#if defined(CreateExtIO)
-#undef CreateExtIO
-#endif /* CreateExtIO */
-
-/****************************************************************************/
-
 struct IORequest *
 CreateExtIO(CONST struct MsgPort * port, LONG io_size)
 {
--- a/library/amiga_createport.c
+++ b/library/amiga_createport.c
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_createport.c,v 1.2 2004-11-13 12:55:39 obarthel Exp $
+ * $Id: amiga_createport.c,v 1.1.1.1 2004-07-26 16:30:18 obarthel Exp $
 *
 * :ts=4
 *
@@ -44,12 +44,6 @@

 /****************************************************************************/

-#if defined(CreatePort)
-#undef CreatePort
-#endif /* CreatePort */
-
-/****************************************************************************/
-
 struct MsgPort *
 CreatePort(CONST_STRPTR name, LONG pri)
 {
--- a/library/amiga_createstdio.c
+++ b/library/amiga_createstdio.c
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_createstdio.c,v 1.2 2004-11-10 14:55:30 obarthel Exp $
+ * $Id: amiga_createstdio.c,v 1.1.1.1 2004-07-26 16:30:18 obarthel Exp $
 *
 * :ts=4
 *
@@ -44,12 +44,6 @@

 /****************************************************************************/

-#if defined(CreateStdIO)
-#undef CreateStdIO
-#endif /* CreateStdIO */
-
-/****************************************************************************/
-
 struct IOStdReq *
 CreateStdIO(CONST struct MsgPort * port)
 {
--- a/library/amiga_createtask.c
+++ b/library/amiga_createtask.c
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_createtask.c,v 1.2 2004-11-13 12:55:39 obarthel Exp $
+ * $Id: amiga_createtask.c,v 1.1.1.1 2004-07-26 16:30:18 obarthel Exp $
 *
 * :ts=4
 *
@@ -31,6 +31,8 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

+#ifndef __PPC__
+
 /****************************************************************************/

 #include <exec/libraries.h>
@@ -51,10 +53,6 @@

 /****************************************************************************/

-#ifndef __PPC__
-
-/****************************************************************************/
-
 /*
 *  Create a task with given name, priority, and stack size.
 *  It will use the default exception and trap handlers for now.
@@ -193,44 +191,4 @@ CreateTask(CONST_STRPTR name,LONG pri,CONST APTR init_pc,ULONG stack_size)

 /****************************************************************************/

-#else
-
-/****************************************************************************/
-
-#if defined(CreateTask)
-#undef CreateTask
-#endif /* CreateTask */
-
-/****************************************************************************/
-
-struct Task *
-CreateTask(CONST_STRPTR name,LONG pri,CONST APTR init_pc,ULONG stack_size)
-{
-	struct Task * result = NULL;
-
-	ENTER();
-
-	SHOWSTRING(name);
-	SHOWVALUE(pri);
-	SHOWPOINTER(init_pc);
-	SHOWVALUE(stack_size);
-
-	assert( name != NULL && (-128 <= pri && pri <= 127) && init_pc != NULL && stack_size > 0 );
-
-	if(name == NULL || pri < -128 || pri > 127 || init_pc == NULL || stack_size == 0)
-	{
-		SHOWMSG("invalid parameters");
-		goto out;
-	}
-
-	result = IExec->CreateTask(name,pri,init_pc,stack_size,NULL);
-
- out:
-
-	RETURN(result);
-	return(result);
-}
-
-/****************************************************************************/
-
 #endif /* __PPC__ */
--- a/library/amiga_deleteextio.c
+++ b/library/amiga_deleteextio.c
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_deleteextio.c,v 1.2 2004-11-10 14:55:30 obarthel Exp $
+ * $Id: amiga_deleteextio.c,v 1.1.1.1 2004-07-26 16:30:18 obarthel Exp $
 *
 * :ts=4
 *
@@ -44,12 +44,6 @@

 /****************************************************************************/

-#if defined(DeleteExtIO)
-#undef DeleteExtIO
-#endif /* DeleteExtIO */
-
-/****************************************************************************/
-
 VOID
 DeleteExtIO(struct IORequest * io)
 {
--- a/library/amiga_deleteport.c
+++ b/library/amiga_deleteport.c
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_deleteport.c,v 1.2 2004-11-13 12:55:39 obarthel Exp $
+ * $Id: amiga_deleteport.c,v 1.1.1.1 2004-07-26 16:30:19 obarthel Exp $
 *
 * :ts=4
 *
@@ -44,12 +44,6 @@

 /****************************************************************************/

-#if defined(DeletePort)
-#undef DeletePort
-#endif /* DeletePort */
-
-/****************************************************************************/
-
 VOID
 DeletePort(struct MsgPort * port)
 {
--- a/library/amiga_deletestdio.c
+++ b/library/amiga_deletestdio.c
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_deletestdio.c,v 1.2 2004-11-10 14:55:30 obarthel Exp $
+ * $Id: amiga_deletestdio.c,v 1.1.1.1 2004-07-26 16:30:19 obarthel Exp $
 *
 * :ts=4
 *
@@ -44,12 +44,6 @@

 /****************************************************************************/

-#if defined(DeleteStdIO)
-#undef DeleteStdIO
-#endif /* DeleteStdIO */
-
-/****************************************************************************/
-
 VOID
 DeleteStdIO(struct IOStdReq * io)
 {
--- a/library/amiga_deletetask.c
+++ b/library/amiga_deletetask.c
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_deletetask.c,v 1.2 2004-11-13 12:55:39 obarthel Exp $
+ * $Id: amiga_deletetask.c,v 1.1.1.1 2004-07-26 16:30:19 obarthel Exp $
 *
 * :ts=4
 *
@@ -41,34 +41,8 @@

 /****************************************************************************/

-#ifndef __PPC__
-
-/****************************************************************************/
-
 VOID
 DeleteTask(struct Task *tc)
 {
 	RemTask(tc);
 }
-
-/****************************************************************************/
-
-#else
-
-/****************************************************************************/
-
-#if defined(DeleteTask)
-#undef DeleteTask
-#endif /* DeleteTask */
-
-/****************************************************************************/
-
-VOID
-DeleteTask(struct Task *tc)
-{
-	IExec->DeleteTask(tc);
-}
-
-/****************************************************************************/
-
-#endif /* __PPC__ */
--- a/library/amiga_rexxvars.c
+++ b/library/amiga_rexxvars.c
@@ -1,193 +0,0 @@
-/*
- * $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-2004 by Olaf Barthel <olsen@sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* We don't want to pull in <clib/alib_protos.h> */
-#define CLIB_ALIB_PROTOS_H
-
-#ifndef _STDLIB_HEADERS_H
-#include "stdlib_headers.h"
-#endif /* _STDLIB_HEADERS_H */
-
-/****************************************************************************/
-
-#include <rexx/rxslib.h>
-#include <rexx/errors.h>
-
-/****************************************************************************/
-
-#define __NOLIBBASE__
-#include <proto/rexxsyslib.h>
-
-/****************************************************************************/
-
-STATIC struct Library * RexxSysBase;
-
-/****************************************************************************/
-
-#if defined(__amigaos4__)
-STATIC struct RexxSysIFace * IRexxSys;
-#endif /* __amigaos4__ */
-
-/****************************************************************************/
-
-CLIB_CONSTRUCTOR(__rexxvars_init)
-{
-	ENTER();
-
-	RexxSysBase = OpenLibrary(RXSNAME,0);
-
-	#if defined(__amigaos4__)
-	{
-		if(RexxSysBase != NULL)
-		{
-			IRexxSys = (struct RexxSysIFace *)GetInterface(RexxSysBase, "main", 1, 0);
-			if(IRexxSys == NULL)
-			{
-				CloseLibrary(RexxSysBase);
-				RexxSysBase = NULL;
-			}
-		}
-	}
-	#endif /* __amigaos4__ */
-
-	CONSTRUCTOR_SUCCEED();
-}
-
-/****************************************************************************/
-
-CLIB_DESTRUCTOR(__rexxvars_exit)
-{
-	ENTER();
-
-	#if defined(__amigaos4__)
-	{
-		if(IRexxSys != NULL)
-			DropInterface((struct Interface *)IRexxSys);
-
-		IRexxSys = NULL;
-	}
-	#endif /* __amigaos4__ */
-
-	if(RexxSysBase != NULL)
-	{
-		CloseLibrary(RexxSysBase);
-		RexxSysBase = NULL;
-	}
-
-	LEAVE();
-}
-
-/****************************************************************************/
-
-/* This is modeled after the original assembly language code. Except for the
-   fact that we compare the library base against a local, static variable
-   rather then opening the library for each check. */
-BOOL
-CheckRexxMsg(struct RexxMsg *message)
-{
-	BOOL result = FALSE;
-
-	if(RexxSysBase == NULL)
-		goto out;
-
-	if(message->rm_LibBase != RexxSysBase)
-		goto out;
-
-	if(message->rm_TaskBlock == NULL)
-		goto out;
-
-	if(NOT IsRexxMsg(message))
-		goto out;
-
-	result = TRUE;
-
- out:
-
-	return(result);
-}
-
-/****************************************************************************/
-
-/* The following function works in about like the original, except that it's
-   not reentrant, does not fill in a pointer to the variable itself and
-   requires rexxsyslib.library V45. */
-LONG
-GetRexxVar(struct RexxMsg *message,STRPTR variable_name,STRPTR *buffer_pointer)
-{
-	STATIC TEXT buffer[256];
-	LONG result;
-
-	/* The following uses a function which was added to rexxsyslib.library V45.
-	   We therefore have a minimum library version requirement. */
-	if(RexxSysBase == NULL || RexxSysBase->lib_Version < 45 || NOT IsRexxMsg(message))
-	{
-		result = ERR10_010; /* invalid message packet */
-		goto out;
-	}
-
-	/* The 256 character limit isn't good. This should be done differently. */
-	result = GetRexxVarFromMsg(variable_name,buffer,message);
-	if(result != 0)
-		goto out;
-
-	(*buffer_pointer) = buffer;
-
- out:
-
-	return(result);
-}
-
-/****************************************************************************/
-
-/* The following function works in about like the original, except that it
-   ignores the length parameter (the value needs to be a NUL-terminated string)
-   and requires rexxsyslib.library V45. */
-LONG
-SetRexxVar(struct RexxMsg *message,STRPTR variable_name,STRPTR value,ULONG length)
-{
-	LONG result;
-
-	/* The following uses a function which was added to rexxsyslib.library V45.
-	   We therefore have a minimum library version requirement. */
-	if(RexxSysBase == NULL || RexxSysBase->lib_Version < 45 || NOT IsRexxMsg(message))
-	{
-		result = ERR10_010; /* invalid message packet */
-		goto out;
-	}
-
-	result = SetRexxVarFromMsg(variable_name,value,message);
-
- out:
-
-	return(result);
-}
--- a/library/c.lib_rev.h
+++ b/library/c.lib_rev.h
@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	184
-#define DATE		"28.11.2004"
-#define VERS		"c.lib 1.184"
-#define VSTRING		"c.lib 1.184 (28.11.2004)\r\n"
-#define VERSTAG		"\0$VER: c.lib 1.184 (28.11.2004)"
+#define REVISION	180
+#define DATE		"23.10.2004"
+#define VERS		"c.lib 1.180"
+#define VSTRING		"c.lib 1.180 (23.10.2004)\r\n"
+#define VERSTAG		"\0$VER: c.lib 1.180 (23.10.2004)"
--- a/library/c.lib_rev.rev
+++ b/library/c.lib_rev.rev
@@ -1 +1 @@
-184
+180
--- a/library/changes
+++ b/library/changes
@@ -1,102 +1,3 @@
-c.lib 1.184 (28.11.2004)
-
- Added asctime_r(), ctime_r(), gmtime_r(), localtime_r() and strtok_r().
-
- Added stubs for the Rexx Variables Interface code that used to
-  be part of amiga.lib. While comparable functionality is available
-  in rexxsyslib.library V45, the new stubs might be helpful during
-  porting. Care must be taken since these functions don't work
-  exactly like the originals.
-
- Integrated strlcpy() and strlcat() which are intended to be safer
-  replacements for strncpy() and strncat().
-
- The program's task priority is now configurable through an external
-  variable '__priority'.
-
- The process name to be used when detaching can be configured through
-  the new '__process_name' variable.
-
- The minimum required operating system version can be configured
-  through the new '__minimum_os_lib_version' variable; a matching
-  error message can be provided through the new '__minimum_os_lib_error'
-  variable.
-
- The default console window specification can be overriden through
-  the new '__stdio_window_specification' variable.
-
- The socket initialization code did not set up a reference to the
-  'h_errno' variable correctly. This had the effect of making name
-  and address resolution errors trash the 'errno' variable instead
-  and leaving 'h_errno' always set to 0. Fixed.
-
- For sockets, ioctl() and fcntl() now interact on the FIONBIO/FIOASYNC
-  requests (ioctl) and the O_NOBLOCK/O_ASYNC flags (fcntl).
-
- popen() now accepts "rb" and "wb" as mode parameters. However, "r+",
-  "w+" and variants thereof are still unsupported due to the
-  unidirectional pipe support in the standard "PIPE:" device.
-
-
-c.lib 1.183 (13.11.2004)
-
- Cleaned up the OS4 build makefile, losing redundant libraries,
-  adding more startup object code and ultimatively making the whole
-  rebuild logic work again: if code changes and dependencies are
-  set up correctly, it will now get rebuilt. Previously, such
-  changes went unnoticed and you had to rebuild the entire library
-  from scratch.
-
- Added stubs for CreatePort(), DeletePort(), CreateTask(), DeleteTask()
-  and NewList() which have equivalents in exec.library V50 but for which
-  it might be useful if ported code didn't have to reference these
-  explicitly.
-
- mktemp() was broken in libunix.a with Unix path semantics enabled.
-  This was because the name template was translated and translated
-  back again, overwriting the translation buffer. This, funny enough,
-  broke Samba's printing feature. Fixed by translating the name only
-  before each test for "uniqueness" is made. The new code also handles
-  empty "" templates gracefully, which was a problem with both the
-  "standard" and the Unix path semantics flavour.
-
-  Why is it that I find bugs like this always after having just
-  released another library update?
-
-
-c.lib 1.182 (8.11.2004)
-
- Changed the error abort condition for the %s conversion of the
-  scanf() family. It now matches the abort conditions for all other
-  conversions and no longer ignores whether any other parameters were
-  converted before. This was a quirk in the older implementation.
-
- The scanf() family now accepts %E and %G in place of %f and %X in
-  place of %x.
-
- Simplified the common code that fopen(), freopen() and fdopen()
-  share and which has to figure out by looking at a file access
-  mode specification which parameters should be used.
-
- Dropped error detection in the scanf() family. The EOF has to be
-  good enough. Also, ungetc() failure still leads to error handling.
-
-
-
-c.lib 1.181 (26.10.2004)
-
- The scanf() family now always returns the number of assignments made
-  unless an error occured or an EOF was hit during conversion before the
-  first assignment could be made.
-
- strtok() did not terminate properly if the last token in the string
-  did not end with a separator character but with a '\0' byte. Fixed.
-
- The directory scanning functions opendir/closedir did not get the global
-  directory data tracking data structure initialized which later led to
-  Enforcer hits and maybe trashed memory. Fixed.
-
-
 c.lib 1.180 (23.10.2004)

 - The printf() family now produces no output at all for %e, %f and %g if the
--- a/library/debug.h
+++ b/library/debug.h
@@ -1,5 +1,5 @@
 /*
- * $Id: debug.h,v 1.2 2004-11-14 11:06:27 obarthel Exp $
+ * $Id: debug.h,v 1.1.1.1 2004-07-26 16:30:26 obarthel Exp $
 *
 * :ts=8
 *
@@ -57,17 +57,9 @@

 /****************************************************************************/

-#ifndef _STDLIB_H
-#include <stdlib.h>
-#endif /* _STDLIB_H */
-
-#ifndef _DOS_H
-#include <dos.h>
-#endif /* _DOS_H */
-
-/****************************************************************************/
-
 extern void kprintf(const char *format,...);
+extern void abort(void);
+extern char * __program_name;

 /****************************************************************************/

--- a/library/debug.lib_rev.h
+++ b/library/debug.lib_rev.h
@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	184
-#define DATE		"28.11.2004"
-#define VERS		"debug.lib 1.184"
-#define VSTRING		"debug.lib 1.184 (28.11.2004)\r\n"
-#define VERSTAG		"\0$VER: debug.lib 1.184 (28.11.2004)"
+#define REVISION	180
+#define DATE		"23.10.2004"
+#define VERS		"debug.lib 1.180"
+#define VSTRING		"debug.lib 1.180 (23.10.2004)\r\n"
+#define VERSTAG		"\0$VER: debug.lib 1.180 (23.10.2004)"
--- a/library/debug.lib_rev.rev
+++ b/library/debug.lib_rev.rev
@@ -1 +1 @@
-184
+180
--- a/library/dirent_data.c
+++ b/library/dirent_data.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dirent_data.c,v 1.4 2004-10-24 20:03:42 obarthel Exp $
+ * $Id: dirent_data.c,v 1.3 2004-08-07 10:24:04 obarthel Exp $
 *
 * :ts=4
 *
@@ -38,7 +38,7 @@
 /****************************************************************************/

 /* Directories being scanned whose locks need to be freed when shutting down. */
-struct MinList NOCOMMON __directory_list;
+struct MinList __directory_list;

 /****************************************************************************/

--- a/library/dirent_headers.h
+++ b/library/dirent_headers.h
@@ -1,5 +1,5 @@
 /*
- * $Id: dirent_headers.h,v 1.2 2004-10-24 20:03:42 obarthel Exp $
+ * $Id: dirent_headers.h,v 1.1.1.1 2004-07-26 16:30:30 obarthel Exp $
 *
 * :ts=4
 *
@@ -42,12 +42,6 @@

 /****************************************************************************/

-#ifndef _MACROS_H
-#include "macros.h"
-#endif /* _MACROS_H */
-
-/****************************************************************************/
-
 struct DirectoryHandle
 {
 	struct MinNode			dh_MinNode;
@@ -62,7 +56,7 @@ struct DirectoryHandle

 /****************************************************************************/

-extern struct MinList NOCOMMON __directory_list;
+extern struct MinList __directory_list;

 /****************************************************************************/

--- a/library/fcntl_close.c
+++ b/library/fcntl_close.c
@@ -1,5 +1,5 @@
 /*
- * $Id: fcntl_close.c,v 1.3 2004-11-28 10:01:26 obarthel Exp $
+ * $Id: fcntl_close.c,v 1.2 2004-08-07 09:15:32 obarthel Exp $
 *
 * :ts=4
 *
@@ -135,7 +135,7 @@ __close(int file_descriptor,int * error_ptr)
 			SHOWMSG("resetting non-blocking access mode");

 			message.action	= file_hook_action_set_blocking;
-			message.arg		= 1;
+			message.block	= 1;

 			assert( fd->fd_Hook != NULL );

--- a/library/fcntl_fcntl.c
+++ b/library/fcntl_fcntl.c
@@ -1,5 +1,5 @@
 /*
- * $Id: fcntl_fcntl.c,v 1.4 2004-11-28 10:01:26 obarthel Exp $
+ * $Id: fcntl_fcntl.c,v 1.2 2004-08-07 09:15:32 obarthel Exp $
 *
 * :ts=4
 *
@@ -126,13 +126,10 @@ fcntl(int file_descriptor, int cmd, ... /* int arg */ )

 			SHOWMSG("cmd=F_GETFL");

-			result = 0;
-
 			if(FLAG_IS_SET(fd->fd_Flags,FDF_NON_BLOCKING))
-				SET_FLAG(result,O_NONBLOCK);
-
-			if(FLAG_IS_SET(fd->fd_Flags,FDF_ASYNC_IO))
-				SET_FLAG(result,O_ASYNC);
+				result = O_NONBLOCK;
+			else
+				result = 0;

 			break;

@@ -150,7 +147,7 @@ fcntl(int file_descriptor, int cmd, ... /* int arg */ )
 			   (FLAG_IS_CLEAR(flags,O_NONBLOCK) && FLAG_IS_SET(fd->fd_Flags,FDF_NON_BLOCKING)))
 			{
 				message.action	= file_hook_action_set_blocking;
-				message.arg		= FLAG_IS_CLEAR(flags,O_NONBLOCK);
+				message.block	= FLAG_IS_CLEAR(flags,O_NONBLOCK);

 				assert( fd->fd_Hook != NULL );

@@ -171,31 +168,6 @@ fcntl(int file_descriptor, int cmd, ... /* int arg */ )
 					CLEAR_FLAG(fd->fd_Flags,FDF_NON_BLOCKING);
 			}

-			if((FLAG_IS_SET(flags,O_ASYNC) && FLAG_IS_CLEAR(fd->fd_Flags,FDF_ASYNC_IO)) ||
-			   (FLAG_IS_CLEAR(flags,O_ASYNC) && FLAG_IS_SET(fd->fd_Flags,FDF_ASYNC_IO)))
-			{
-				message.action	= file_hook_action_set_async;
-				message.arg		= FLAG_IS_SET(flags,O_ASYNC);
-
-				assert( fd->fd_Hook != NULL );
-
-				CallHookPkt(fd->fd_Hook,fd,&message);
-
-				result = message.result;
-				if(result < 0)
-				{
-					errno = message.error;
-
-					va_end(arg);
-					goto out;
-				}
-
-				if(FLAG_IS_SET(flags,O_ASYNC))
-					SET_FLAG(fd->fd_Flags,FDF_ASYNC_IO);
-				else
-					CLEAR_FLAG(fd->fd_Flags,FDF_ASYNC_IO);
-			}
-
 			va_end(arg);

 			break;
--- a/library/include/dos.h
+++ b/library/include/dos.h
@@ -1,5 +1,5 @@
 /*
- * $Id: dos.h,v 1.4 2004-11-14 11:06:28 obarthel Exp $
+ * $Id: dos.h,v 1.3 2004-08-25 15:27:28 obarthel Exp $
 *
 * :ts=4
 *
@@ -164,28 +164,6 @@ extern ULONG __free_memory_threshold;
 * them initialized to certain well-defined values to get the desired effect.
 */

-/*
- * The minimum required operating system version number is 37, which
- * corresponds to Workbench/Kickstart 2.04. You may request a higher
- * version number by defining the following variable; if you do so,
- * please provide a fitting error message, too. Note that you cannot
- * request a minimum version number lower than 37.
- */
-extern int __minimum_os_lib_version;
-extern char * __minimum_os_lib_error;
-
-/*
- * If your program is launched from Workbench it will not necessarily
- * have a window to send console output to and from which console
- * input can be read. The startup code attempts to set up such a console
- * window for you, but it uses defaults for the window specification.
- * These defaults can be overridden by your program if you define a
- * variable to point to the specification string. Note that if you
- * request a specific window specification, this will also override
- * any tool window definition stored in the program's icon.
- */
-extern char * __stdio_window_specification;
-
 /*
 * If set to TRUE, your program's process->pr_WindowPtr will be set to -1
 * when it starts. The process->pr_WindowPtr will be automatically restored
@@ -214,20 +192,6 @@ extern BOOL __detach;
 */
 extern BOOL (* __check_detach)(void);

-/*
- * If this pointer is not NULL, it refers the name that will be given to
- * the process which is created when the program detaches. The default
- * is to reuse the program name instead.
- */
-extern char * __process_name;
-
-/*
- * This variable controls the task priority of the program, when running.
- * It must be in the range -128..127 to be useful. By default, the task
- * priority will not be changed.
- */
-extern int __priority;
-
 /*
 * This variable can be set up to contain the minimum stack size the program
 * should be launched with. If the startup code finds that there is not enough
--- a/library/include/fcntl.h
+++ b/library/include/fcntl.h
@@ -1,5 +1,5 @@
 /*
- * $Id: fcntl.h,v 1.3 2004-11-27 12:43:12 obarthel Exp $
+ * $Id: fcntl.h,v 1.2 2004-08-07 09:15:33 obarthel Exp $
 *
 * :ts=4
 *
@@ -67,7 +67,6 @@ extern "C" {
 #define O_NONBLOCK	(1<<6)
 #define O_SYNC		(0)
 #define O_NOCTTY	(0)
-#define O_ASYNC		(1<<7)

 /****************************************************************************/

--- a/library/include/string.h
+++ b/library/include/string.h
@@ -1,5 +1,5 @@
 /*
- * $Id: string.h,v 1.5 2004-11-17 19:07:26 obarthel Exp $
+ * $Id: string.h,v 1.3 2004-08-07 09:15:33 obarthel Exp $
 *
 * :ts=4
 *
@@ -122,15 +122,6 @@ extern int bcmp(const void *a,const void *b,size_t len);

 /****************************************************************************/

-extern size_t strlcpy(char *dst, const char *src, size_t siz);
-extern size_t strlcat(char *dst, const char *src, size_t siz);
-
-/****************************************************************************/
-
-extern char * strtok_r(char *str, const char *separator_set,char ** state_ptr);
-
-/****************************************************************************/
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/library/include/time.h
+++ b/library/include/time.h
@@ -1,5 +1,5 @@
 /*
- * $Id: time.h,v 1.2 2004-11-17 19:07:26 obarthel Exp $
+ * $Id: time.h,v 1.1.1.1 2004-07-26 16:32:56 obarthel Exp $
 *
 * :ts=4
 *
@@ -95,17 +95,6 @@ extern size_t strftime(char *s, size_t maxsize, const char *format,

 /****************************************************************************/

-/* The following is not part of the ISO 'C' (1994) standard. */
-
-/****************************************************************************/
-
-extern char * asctime_r(const struct tm *tm,char * buffer);
-extern char * ctime_r(const time_t *tptr,char * buffer);
-extern struct tm * gmtime_r(const time_t *t,struct tm * tm_ptr);
-extern struct tm * localtime_r(const time_t *t,struct tm * tm_ptr);
-
-/****************************************************************************/
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/library/m.lib_rev.h
+++ b/library/m.lib_rev.h
@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	184
-#define DATE		"28.11.2004"
-#define VERS		"m.lib 1.184"
-#define VSTRING		"m.lib 1.184 (28.11.2004)\r\n"
-#define VERSTAG		"\0$VER: m.lib 1.184 (28.11.2004)"
+#define REVISION	180
+#define DATE		"23.10.2004"
+#define VERS		"m.lib 1.180"
+#define VSTRING		"m.lib 1.180 (23.10.2004)\r\n"
+#define VERSTAG		"\0$VER: m.lib 1.180 (23.10.2004)"
--- a/library/m.lib_rev.rev
+++ b/library/m.lib_rev.rev
@@ -1 +1 @@
-184
+180
--- a/library/m881.lib_rev.h
+++ b/library/m881.lib_rev.h
@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	184
-#define DATE		"28.11.2004"
-#define VERS		"m881.lib 1.184"
-#define VSTRING		"m881.lib 1.184 (28.11.2004)\r\n"
-#define VERSTAG		"\0$VER: m881.lib 1.184 (28.11.2004)"
+#define REVISION	180
+#define DATE		"23.10.2004"
+#define VERS		"m881.lib 1.180"
+#define VSTRING		"m881.lib 1.180 (23.10.2004)\r\n"
+#define VERSTAG		"\0$VER: m881.lib 1.180 (23.10.2004)"
--- a/library/m881.lib_rev.rev
+++ b/library/m881.lib_rev.rev
@@ -1 +1 @@
-184
+180
--- a/library/net.lib_rev.h
+++ b/library/net.lib_rev.h
@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	184
-#define DATE		"28.11.2004"
-#define VERS		"net.lib 1.184"
-#define VSTRING		"net.lib 1.184 (28.11.2004)\r\n"
-#define VERSTAG		"\0$VER: net.lib 1.184 (28.11.2004)"
+#define REVISION	180
+#define DATE		"23.10.2004"
+#define VERS		"net.lib 1.180"
+#define VSTRING		"net.lib 1.180 (23.10.2004)\r\n"
+#define VERSTAG		"\0$VER: net.lib 1.180 (23.10.2004)"
--- a/library/net.lib_rev.rev
+++ b/library/net.lib_rev.rev
@@ -1 +1 @@
-184
+180
--- a/library/signal_headers.h
+++ b/library/signal_headers.h
@@ -1,5 +1,5 @@
 /*
- * $Id: signal_headers.h,v 1.2 2004-11-14 11:06:27 obarthel Exp $
+ * $Id: signal_headers.h,v 1.1.1.1 2004-07-26 16:31:05 obarthel Exp $
 *
 * :ts=4
 *
@@ -68,20 +68,20 @@ typedef void (*signal_handler_t)(int sig);

 /****************************************************************************/

-extern signal_handler_t	NOCOMMON __signal_handler_table[NUM_SIGNALS];
+extern signal_handler_t	__signal_handler_table[NUM_SIGNALS];

 /****************************************************************************/

-extern int NOCOMMON __signals_blocked;
+extern int __signals_blocked;

 /****************************************************************************/

-extern BOOL NOCOMMON __termination_message_printed;
-extern BOOL NOCOMMON __termination_message_disabled;
+extern BOOL __termination_message_printed;
+extern BOOL __termination_message_disabled;

 /****************************************************************************/

-extern const char NOCOMMON __abnormal_program_termination[];
+extern const char __abnormal_program_termination[];

 /****************************************************************************/

--- a/library/smakefile
+++ b/library/smakefile
@@ -1,5 +1,5 @@
 #
-# $Id: smakefile,v 1.12 2004-11-18 09:40:37 obarthel Exp $
+# $Id: smakefile,v 1.10 2004-09-29 14:17:44 obarthel Exp $
 #
 # :ts=8
 #
@@ -88,7 +88,6 @@ AMIGA_OBJ = \
 	amiga_newlist.o \
 	amiga_rangerand.o \
 	amiga_remtof.o \
-	amiga_rexxvars.o \
 	amiga_setsuperattrs.o \
 	amiga_timedelay.o \
 	amiga_waitbeam.o \
@@ -395,10 +394,6 @@ STDLIB_OBJ = \
 	stdlib_mkstemp.o \
 	stdlib_mktemp.o \
 	stdlib_never_free.o \
-	stdlib_osliberror.o \
-	stdlib_oslibversion.o \
-	stdlib_priority.o \
-	stdlib_process_name.o \
 	stdlib_putenv.o \
 	stdlib_qsort.o \
 	stdlib_rand.o \
@@ -424,8 +419,7 @@ STDLIB_OBJ = \
 	stdlib_swapstack.o \
 	stdlib_system.o \
 	stdlib_unsetenv.o \
-	stdlib_wildcard_expand.o \
-	stdlib_stdio_window_spec.o
+	stdlib_wildcard_expand.o

 STRING_OBJ = \
 	string_bcmp.o \
@@ -446,8 +440,6 @@ STRING_OBJ = \
 	string_strcspn.o \
 	string_strdup.o \
 	string_strerror.o \
-	string_strlcat.o \
-	string_strlcpy.o \
 	string_strlen.o \
 	string_strncat.o \
 	string_strncmp.o \
@@ -457,7 +449,6 @@ STRING_OBJ = \
 	string_strspn.o \
 	string_strstr.o \
 	string_strtok.o \
-	string_strtok_r.o \
 	string_strxfrm.o

 STRINGS_OBJ = \
@@ -466,18 +457,14 @@ STRINGS_OBJ = \

 TIME_OBJ = \
 	time_asctime.o \
-	time_asctime_r.o \
 	time_clock.o \
 	time_converttime.o \
 	time_ctime.o \
-	time_ctime_r.o \
 	time_data.o \
 	time_difftime.o \
 	time_gettimeofday.o \
 	time_gmtime.o \
-	time_gmtime_r.o \
 	time_localtime.o \
-	time_localtime_r.o \
 	time_mktime.o \
 	time_numbertostring.o \
 	time_strftime.o \
--- a/library/socket_data.c
+++ b/library/socket_data.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_data.c,v 1.3 2004-11-14 11:06:27 obarthel Exp $
+ * $Id: socket_data.c,v 1.2 2004-07-28 15:50:45 obarthel Exp $
 *
 * :ts=4
 *
@@ -46,7 +46,9 @@ struct Library * __SocketBase;
 /****************************************************************************/

 #if defined(__amigaos4__)
+
 struct SocketIFace *__ISocket;
+
 #endif /* __amigaos4__ */

 /****************************************************************************/
--- a/library/socket_headers.h
+++ b/library/socket_headers.h
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_headers.h,v 1.3 2004-11-14 11:06:27 obarthel Exp $
+ * $Id: socket_headers.h,v 1.2 2004-07-28 15:50:45 obarthel Exp $
 *
 * :ts=4
 *
@@ -48,19 +48,19 @@

 /****************************************************************************/

-extern struct Library * NOCOMMON __SocketBase;
+extern struct Library * __SocketBase;

 /****************************************************************************/

 #if defined(__amigaos4__)

-extern struct SocketIFace * NOCOMMON __ISocket;
+extern struct SocketIFace *__ISocket;

 #endif /* __amigaos4__ */

 /****************************************************************************/

-extern int NOCOMMON h_errno;
+extern int h_errno;

 /****************************************************************************/

--- a/library/socket_hook_entry.c
+++ b/library/socket_hook_entry.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_hook_entry.c,v 1.3 2004-11-28 10:01:26 obarthel Exp $
+ * $Id: socket_hook_entry.c,v 1.1.1.1 2004-07-26 16:31:14 obarthel Exp $
 *
 * :ts=4
 *
@@ -41,10 +41,6 @@

 /****************************************************************************/

-#include <sys/ioctl.h>
-
-/****************************************************************************/
-
 void
 __socket_hook_entry(
 	struct Hook * UNUSED		unused_hook,
@@ -53,7 +49,6 @@ __socket_hook_entry(
 {
 	struct FileInfoBlock * fib;
 	int error = OK;
-	int param;
 	int result;

 	assert( message != NULL && fd != NULL );
@@ -134,28 +129,6 @@ __socket_hook_entry(

 			break;

-		case file_hook_action_set_blocking:
-
-			SHOWMSG("file_hook_action_set_blocking");
-
-			param = (int)(message->arg == 0);
-
-			result	= __IoctlSocket(fd->fd_DefaultFile,FIONBIO,&param);
-			error	= errno;
-
-			break;
-
-		case file_hook_action_set_async:
-
-			SHOWMSG("file_hook_action_set_async");
-
-			param = (int)(message->arg != 0);
-
-			result	= __IoctlSocket(fd->fd_DefaultFile,FIOASYNC,&param);
-			error	= errno;
-
-			break;
-
 		case file_hook_action_examine:

 			SHOWMSG("file_hook_action_examine");
--- a/library/socket_init_exit.c
+++ b/library/socket_init_exit.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_init_exit.c,v 1.5 2004-11-14 11:06:27 obarthel Exp $
+ * $Id: socket_init_exit.c,v 1.4 2004-09-29 17:03:57 obarthel Exp $
 *
 * :ts=4
 *
@@ -39,16 +39,16 @@
 #include "socket_headers.h"
 #endif /* _SOCKET_HEADERS_H */

-#ifndef _SIGNAL_HEADERS_H
-#include "signal_headers.h"
-#endif /* _SIGNAL_HEADERS_H */
-
 /****************************************************************************/

 #include "stdlib_protos.h"

 /****************************************************************************/

+extern BOOL __detach;
+
+/****************************************************************************/
+
 /* Code value. */
 #define SBTB_CODE 1
 #define SBTS_CODE 0x3FFF
@@ -78,6 +78,16 @@ struct DaemonMessage

 /****************************************************************************/

+extern BOOL		__termination_message_disabled;
+extern char *	__program_name;
+extern BOOL		__is_daemon;
+
+/****************************************************************************/
+
+extern void __socket_hook_entry(struct Hook * hook,struct fd * fd,struct file_hook_message * message);
+
+/****************************************************************************/
+
 CLIB_DESTRUCTOR(__socket_exit)
 {
 	ENTER();
@@ -182,7 +192,7 @@ __socket_init(void)

 	/* Wire the library's h_errno variable to our local h_errno. */
 	tags[3].ti_Tag	= SBTM_SETVAL(SBTC_HERRNOLONGPTR);
-	tags[3].ti_Data	= (ULONG)&h_errno;
+	tags[3].ti_Data	= (ULONG)&errno;

 	tags[4].ti_Tag = TAG_END;

--- a/library/socket_ioctl.c
+++ b/library/socket_ioctl.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_ioctl.c,v 1.3 2004-11-28 10:01:26 obarthel Exp $
+ * $Id: socket_ioctl.c,v 1.1.1.1 2004-07-26 16:31:16 obarthel Exp $
 *
 * :ts=4
 *
@@ -47,10 +47,6 @@

 /****************************************************************************/

-#include <sys/ioctl.h>
-
-/****************************************************************************/
-
 int
 ioctl(int sockfd,unsigned long request, ... /* char *arg */)
 {
@@ -85,26 +81,6 @@ ioctl(int sockfd,unsigned long request, ... /* char *arg */)
 	result = __IoctlSocket((LONG)fd->fd_DefaultFile,request,param);
 	PROFILE_ON();

-	if(result == OK)
-	{
-		int * option = (int *)param;
-
-		if(request == FIONBIO)
-		{
-			if((*option) != 0)
-				SET_FLAG(fd->fd_Flags,FDF_NON_BLOCKING);
-			else
-				CLEAR_FLAG(fd->fd_Flags,FDF_NON_BLOCKING);
-		}
-		else if (request == FIOASYNC)
-		{
-			if((*option) != 0)
-				SET_FLAG(fd->fd_Flags,FDF_ASYNC_IO);
-			else
-				CLEAR_FLAG(fd->fd_Flags,FDF_ASYNC_IO);
-		}
-	}
-
 	va_end(arg);

 out:
--- a/library/stack.lib_rev.h
+++ b/library/stack.lib_rev.h
@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	184
-#define DATE		"28.11.2004"
-#define VERS		"stack.lib 1.184"
-#define VSTRING		"stack.lib 1.184 (28.11.2004)\r\n"
-#define VERSTAG		"\0$VER: stack.lib 1.184 (28.11.2004)"
+#define REVISION	180
+#define DATE		"23.10.2004"
+#define VERS		"stack.lib 1.180"
+#define VSTRING		"stack.lib 1.180 (23.10.2004)\r\n"
+#define VERSTAG		"\0$VER: stack.lib 1.180 (23.10.2004)"
--- a/library/stack.lib_rev.rev
+++ b/library/stack.lib_rev.rev
@@ -1 +1 @@
-184
+180
--- a/library/stat_headers.h
+++ b/library/stat_headers.h
@@ -1,5 +1,5 @@
 /*
- * $Id: stat_headers.h,v 1.2 2004-11-14 11:06:27 obarthel Exp $
+ * $Id: stat_headers.h,v 1.1.1.1 2004-07-26 16:31:22 obarthel Exp $
 *
 * :ts=4
 *
@@ -42,7 +42,7 @@

 /****************************************************************************/

-extern mode_t NOCOMMON __current_umask;
+extern mode_t __current_umask;

 /****************************************************************************/

--- a/library/stdio_fdhookentry.c
+++ b/library/stdio_fdhookentry.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_fdhookentry.c,v 1.2 2004-11-28 10:01:26 obarthel Exp $
+ * $Id: stdio_fdhookentry.c,v 1.1.1.1 2004-07-26 16:31:28 obarthel Exp $
 *
 * :ts=4
 *
@@ -1829,7 +1829,7 @@ __fd_hook_entry(

 				SHOWMSG("changing the mode");

-				if(message->arg != 0)
+				if(message->block)
 					mode = 0; /* buffered mode */
 				else
 					mode = 1; /* single character mode */
--- a/library/stdio_headers.h
+++ b/library/stdio_headers.h
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_headers.h,v 1.5 2004-11-28 10:01:26 obarthel Exp $
+ * $Id: stdio_headers.h,v 1.2 2004-08-07 09:15:32 obarthel Exp $
 *
 * :ts=4
 *
@@ -252,8 +252,6 @@ struct iob
 										   to have its protection bits updated after
 										   it has been closed */
 #define FDF_CACHE_POSITION	(1UL<<9)	/* Cache the file position. */
-#define FDF_ASYNC_IO		(1UL<<10)	/* File was switched into asynchronous I/O
-										   mode (sockets only). */

 /****************************************************************************/

@@ -308,8 +306,7 @@ enum file_hook_action_t
 	file_hook_action_info,
 	file_hook_action_duplicate_fd,
 	file_hook_action_seek_and_extend,
-	file_hook_action_is_interactive,
-	file_hook_action_set_async
+	file_hook_action_is_interactive
 };

 /****************************************************************************/
@@ -327,7 +324,7 @@ struct file_hook_message
 	struct flock *			lock;		/* Record locking request */
 	int						command;	/* What kind of locking command was sent */

-	int						arg;		/* Whether or not this file should
+	int						block;		/* Whether or not this file should
 										   be set non-blocking */

 	uid_t					owner;
@@ -350,22 +347,22 @@ struct file_hook_message
 /****************************************************************************/

 /* The file handle table. */
-extern struct iob ** NOCOMMON	__iob;
-extern int NOCOMMON				__num_iob;
+extern struct iob **	__iob;
+extern int				__num_iob;

 /****************************************************************************/

 /* The file descriptor table. */
-extern struct fd ** NOCOMMON	__fd;
-extern int NOCOMMON				__num_fd;
+extern struct fd **		__fd;
+extern int				__num_fd;

 /****************************************************************************/

-extern char * NOCOMMON __file_lock_semaphore_name;
+extern char * __file_lock_semaphore_name;

 /****************************************************************************/

-extern BOOL NOCOMMON __no_standard_io;
+extern BOOL __no_standard_io;

 /****************************************************************************/

--- a/library/stdio_openiob.c
+++ b/library/stdio_openiob.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_openiob.c,v 1.3 2004-11-03 15:39:04 obarthel Exp $
+ * $Id: stdio_openiob.c,v 1.1.1.1 2004-07-26 16:31:37 obarthel Exp $
 *
 * :ts=4
 *
@@ -48,7 +48,9 @@ __open_iob(const char *filename, const char *mode, int file_descriptor, int slot
 {
 	ULONG file_flags;
 	int result = -1;
+	char actual_mode[8];
 	int open_mode;
+	size_t mode_len,len,i;
 	struct fd * fd = NULL;
 	STRPTR buffer = NULL;
 	STRPTR aligned_buffer;
@@ -84,49 +86,78 @@ __open_iob(const char *filename, const char *mode, int file_descriptor, int slot
 		}
 	}

-	/* The first character selects the access mode: read, write or append. */
-	switch(mode[0])
+	/* Options can follow the mode string, separated by a comma.
+	 * We don't support any of those.
+	 */
+	len = mode_len = strlen(mode);
+	for(i = 0 ; i < len ; i++)
 	{
-		case 'r':
+		if(mode[i] == ',')
+		{
+			mode_len = i;
+			break;
+		}
+	}

-			SHOWMSG("read mode");
+	/* Keep only the first few letters of the mode string. */
+	if(mode_len > sizeof(actual_mode)-1)
+		mode_len = sizeof(actual_mode)-1;
+
+	memmove(actual_mode,mode,mode_len);
+	actual_mode[mode_len] = '\0';
+
+	SHOWSTRING(actual_mode);
+
+	if(strcmp(actual_mode,"r") == SAME || strcmp(actual_mode,"rb") == SAME)
+	{
+		SHOWMSG("read-only");

 		open_mode	= O_RDONLY;
-			break;
-
-		case 'w':
-
-			SHOWMSG("write mode");
+		file_flags	= IOBF_READ;
+	}
+	else if (strcmp(actual_mode,"w") == SAME || strcmp(actual_mode,"wb") == SAME)
+	{
+		SHOWMSG("write-only");

 		open_mode	= O_WRONLY | O_CREAT | O_TRUNC;
-			break;
-
-		case 'a':
-
-			SHOWMSG("append mode");
+		file_flags	= IOBF_WRITE;
+	}
+	else if (strcmp(actual_mode,"a") == SAME || strcmp(actual_mode,"ab") == SAME)
+	{
+		SHOWMSG("write-only; append");

 		open_mode	= O_WRONLY | O_CREAT | O_APPEND;
-			break;
+		file_flags	= IOBF_WRITE;
+	}
+	else if (strcmp(actual_mode,"r+") == SAME || strcmp(actual_mode,"rb+") == SAME || strcmp(actual_mode,"r+b") == SAME)
+	{
+		SHOWMSG("read/write; don't overwrite");

-		default:
+		open_mode	= O_RDWR;
+		file_flags	= IOBF_READ | IOBF_WRITE;
+	}
+	else if (strcmp(actual_mode,"w+") == SAME || strcmp(actual_mode,"wb+") == SAME || strcmp(actual_mode,"w+b") == SAME)
+	{
+		SHOWMSG("read/write; overwrite");

-			D(("unsupported file open mode '%lc'",mode[0]));
+		open_mode	= O_RDWR | O_CREAT | O_TRUNC;
+		file_flags	= IOBF_READ | IOBF_WRITE;
+	}
+	else if (strcmp(actual_mode,"a+") == SAME || strcmp(actual_mode,"ab+") == SAME || strcmp(actual_mode,"a+b") == SAME)
+	{
+		SHOWMSG("read/write; append; don't overwrite");
+
+		open_mode	= O_RDWR | O_CREAT | O_APPEND;
+		file_flags	= IOBF_READ | IOBF_WRITE;
+	}
+	else
+	{
+		SHOWMSG("unsupported file open mode");

 		errno = EINVAL;
 		goto out;
 	}

-	/* If the second or third character is a '+', switch to read/write mode. */
-	if((mode[1] == '+') || (mode[1] != '\0' && mode[2] == '+'))
-	{
-		SHOWMSG("read/write access");
-
-		CLEAR_FLAG(open_mode,O_RDONLY);
-		CLEAR_FLAG(open_mode,O_WRONLY);
-
-		SET_FLAG(open_mode,O_RDWR);
-	}
-
 	SHOWMSG("allocating file buffer");

 	/* Allocate a little more memory than necessary. */
@@ -162,21 +193,12 @@ __open_iob(const char *filename, const char *mode, int file_descriptor, int slot
 			CLEAR_FLAG(fd->fd_Flags,FDF_APPEND);
 	}

-	/* Figure out the buffered file access mode by looking at the open mode. */
-	file_flags = IOBF_IN_USE | IOBF_NO_NUL;
-
-	if(FLAG_IS_SET(open_mode,O_RDONLY) || FLAG_IS_SET(open_mode,O_RDWR))
-		SET_FLAG(file_flags,IOBF_READ);
-
-	if(FLAG_IS_SET(open_mode,O_WRONLY) || FLAG_IS_SET(open_mode,O_RDWR))
-		SET_FLAG(file_flags,IOBF_WRITE);
-
 	__initialize_iob(file,(HOOKFUNC)__iob_hook_entry,
 		buffer,
 		aligned_buffer,BUFSIZ,
 		file_descriptor,
 		slot_number,
-		file_flags);
+		IOBF_IN_USE | file_flags | IOBF_NO_NUL);

 	buffer = NULL;

--- a/library/stdio_popen.c
+++ b/library/stdio_popen.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_popen.c,v 1.3 2004-11-28 09:33:19 obarthel Exp $
+ * $Id: stdio_popen.c,v 1.2 2004-08-07 09:15:32 obarthel Exp $
 *
 * :ts=4
 *
@@ -94,6 +94,20 @@ pclose(FILE *stream)

 /****************************************************************************/

+#define SET_TAG(t,v,d)					\
+	do									\
+	{									\
+		(t)->ti_Tag		= (Tag)(v);		\
+		(t)->ti_Data	= (ULONG)(d);	\
+		(t)++;							\
+	}									\
+	while(0)
+
+#define END_TAG(t) \
+	(void)((t)->ti_Tag = TAG_END)
+
+/****************************************************************************/
+
 FILE *
 popen(const char *command, const char *type)
 {
@@ -104,10 +118,14 @@ popen(const char *command, const char *type)
 	BPTR input = ZERO;
 	BPTR output = ZERO;
 	char pipe_file_name[40];
+	struct TagItem tags[5];
+	struct TagItem * tag;
 	FILE * result = NULL;
 	LONG status;
 	unsigned long task_address;
 	time_t now;
+	size_t type_len;
+	char actual_type[8];
 	int i;

 	ENTER();
@@ -132,36 +150,6 @@ popen(const char *command, const char *type)
 	if(__check_abort_enabled)
 		__check_abort();

-	/* The first character selects the access mode: read or write. We don't
-	   support anything else. */
-	switch(type[0])
-	{
-		case 'r':
-
-			SHOWMSG("read mode");
-			break;
-
-		case 'w':
-
-			SHOWMSG("write mode");
-			break;
-
-		default:
-
-			D(("unsupported access mode '%lc'",type[0]));
-			errno = EINVAL;
-			goto out;
-	}
-
-	/* The current PIPE: device only supports unidirectional connections. */
-	if((type[1] == '+') || (type[1] != '\0' && type[2] == '+'))
-	{
-		D(("unsupported access mode '%s'",type));
-
-		errno = EINVAL;
-		goto out;
-	}
-
 	#if defined(UNIX_PATH_SEMANTICS)
 	{
 		if(__unix_path_semantics)
@@ -249,10 +237,33 @@ popen(const char *command, const char *type)
 	}
 	#endif /* UNIX_PATH_SEMANTICS */

-	/* Build a (hopefully) unique name for the pipe stream to open. We
-	   construct it from the current process address, converted into
-	   an octal number, followed by the current time (in seconds),
-	   converted into another octal number. */
+	/* Skip any options following the comma. */
+	type_len = strlen(type);
+	for(i = 0 ; i < (int)type_len ; i++)
+	{
+		if(type[i] == ',')
+		{
+			type_len = i;
+			break;
+		}
+	}
+
+	/* Keep only the first few letters of the type string. */
+	if(type_len > sizeof(actual_type)-1)
+		type_len = sizeof(actual_type)-1;
+
+	memmove(actual_type,type,type_len);
+	actual_type[type_len] = '\0';
+
+	/* The current PIPE: device only supports unidirectional connections. */
+	if(strcmp(actual_type,"r+") == SAME)
+	{
+		SHOWMSG("unsupported access mode");
+
+		errno = EINVAL;
+		goto out;
+	}
+
 	strcpy(pipe_file_name,"PIPE:");

 	task_address = (unsigned long)FindTask(NULL);
@@ -279,27 +290,26 @@ popen(const char *command, const char *type)

 	PROFILE_OFF();

-	/* Now open the input and output streams for the program to launch. */
-	if(type[0] == 'r')
+	if(strcmp(actual_type,"r") == SAME)
 	{
-		/* Read mode: we want to read the output of the program; the program
-		   should read from "NIL:". */
 		input = Open("NIL:",MODE_NEWFILE);
 		if(input != ZERO)
 			output = Open(pipe_file_name,MODE_NEWFILE);
 	}
-	else
+	else if (strcmp(actual_type,"w") == SAME)
 	{
-		/* Write mode: we want to send data to the program; the program
-		   should write to "NIL:". */
 		input = Open(pipe_file_name,MODE_NEWFILE);
 		if(input != ZERO)
 			output = Open("NIL:",MODE_NEWFILE);
 	}
+	else
+	{
+		errno = EINVAL;
+		goto out;
+	}

 	PROFILE_ON();

-	/* Check if both I/O streams could be opened. */
 	if(input == ZERO || output == ZERO)
 	{
 		SHOWMSG("couldn't open the streams");
@@ -308,20 +318,18 @@ popen(const char *command, const char *type)
 		goto out;
 	}

+	tag = tags;
+
+	SET_TAG(tag,SYS_Input,		input);
+	SET_TAG(tag,SYS_Output,		output);
+	SET_TAG(tag,SYS_Asynch,		TRUE);
+	SET_TAG(tag,SYS_UserShell,	TRUE);
+	END_TAG(tag);
+
 	PROFILE_OFF();
-
-	/* Now try to launch the program. */
-	status = SystemTags((STRPTR)command,
-		SYS_Input,		input,
-		SYS_Output,		output,
-		SYS_Asynch,		TRUE,
-		SYS_UserShell,	TRUE,
-	TAG_END);
-
+	status = SystemTagList((STRPTR)command,tags);
 	PROFILE_ON();

-	/* If launching the program returned -1 then it could not be started.
-	   We'll need to close the I/O streams we opened above. */
 	if(status == -1)
 	{
 		SHOWMSG("SystemTagList() failed");
@@ -330,11 +338,8 @@ popen(const char *command, const char *type)
 		goto out;
 	}

-	/* OK, the program is running. Once it terminates, it will automatically
-	   shut down the streams we opened for it. */
 	input = output = ZERO;

-	/* Now try to open the pipe we will use to exchange data with the program. */
 	result = fopen(pipe_file_name,type);

 out:
--- a/library/stdio_vfscanf.c
+++ b/library/stdio_vfscanf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_vfscanf.c,v 1.6 2004-11-08 17:57:52 obarthel Exp $
+ * $Id: stdio_vfscanf.c,v 1.3 2004-10-22 10:57:53 obarthel Exp $
 *
 * :ts=4
 *
@@ -105,12 +105,24 @@ __vfscanf(FILE *stream, const char *format, va_list arg)

 		if(isspace(c))
 		{
+			BOOL finished = FALSE;
+
 			/* Skip all blank spaces in the stream. */
 			format++;

-			while((c = __getc(stream)) != EOF)
+			while(TRUE)
 			{
-				if(isspace(c))
+				c = __getc(stream);
+				if(c == EOF)
+				{
+					/* Hit the end of the stream. Due to an error? */
+					if(num_conversions == 0 || ferror(stream))
+						goto out;
+
+					finished = TRUE;
+					break;
+				}
+				else if (isspace(c))
 				{
 					total_num_chars_read++;
 				}
@@ -127,17 +139,8 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 				}
 			}

-			if(c == EOF)
-			{
-				SHOWMSG("end of file");
-
-				/* Hit the end of the stream? */
-				if(num_conversions == 0)
-					goto out;
-
-				/* Finished... */
+			if(finished)
 				break;
-			}

 			/* Resume scanning. */
 			continue;
@@ -156,8 +159,8 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 			{
 				SHOWMSG("end of file");

-				/* Hit the end of the stream. */
-				if(num_conversions == 0)
+				/* Hit the end of the stream. Due to an error? */
+				if(num_conversions == 0 || ferror(stream))
 					goto out;

 				break;
@@ -302,11 +305,9 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 				break;

 			/* It's a floating point number. */
-			case 'e':
-			case 'E':
 			case 'f':
+			case 'e':
 			case 'g':
-			case 'G':

 				conversion_type = 'f';
 				format++;
@@ -320,7 +321,6 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 			case 's':	/* string */
 			case 'u':	/* unsigned integer */
 			case 'x':	/* unsigned integer in hexadecimal format */
-			case 'X':	/* unsigned integer in hexadecimal format */
 			case '%':	/* the % character */
 			case '[':	/* a range of characters */

@@ -339,9 +339,21 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 		   conversion_type != 'n' &&
 		   conversion_type != '[')
 		{
-			while((c = __getc(stream)) != EOF)
+			BOOL finished = FALSE;
+
+			while(TRUE)
 			{
-				if(isspace(c))
+				c = __getc(stream);
+				if(c == EOF)
+				{
+					/* Hit the end of the stream. Due to an error? */
+					if(num_conversions == 0 || ferror(stream))
+						goto out;
+
+					finished = TRUE;
+					break;
+				}
+				else if (isspace(c))
 				{
 					total_num_chars_read++;
 				}
@@ -357,6 +369,9 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 					break;
 				}
 			}
+
+			if(finished)
+				break;
 		}

 		num_chars_processed = 0;
@@ -413,8 +428,8 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 				c = __getc(stream);
 				if(c == EOF)
 				{
-					/* Bail out if we hit the end of the stream. */
-					if(num_conversions == 0)
+					/* Bail out if we hit the end of the stream or an error occured. */
+					if(num_conversions == 0 || ferror(stream))
 						goto out;

 					break;
@@ -594,7 +609,7 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 							maximum_field_width--;
 					}

-					if(c == EOF && num_chars_processed == 0 && num_conversions == 0)
+					if(c == EOF && ((num_chars_processed == 0 && num_conversions == 0) || ferror(stream)))
 						goto out;
 				}

@@ -1185,7 +1200,7 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 					}
 				}

-				if(c == EOF && num_chars_processed == 0 && num_conversions == 0)
+				if(c == EOF && ((num_chars_processed == 0 && num_conversions == 0) || ferror(stream)))
 					goto out;
 			}

@@ -1291,8 +1306,8 @@ __vfscanf(FILE *stream, const char *format, va_list arg)

 				/* The conversion is considered to have failed if an EOF was
 				   encountered before any non-whitespace characters could be
-				   converted. */
-				if(c == EOF && num_chars_processed == 0 && num_conversions == 0)
+				   converted. We also bail out if we hit an error. */
+				if(c == EOF && (num_chars_processed == 0 || ferror(stream)))
 					goto out;
 			}

@@ -1415,8 +1430,8 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 			{
 				SHOWMSG("end of file");

-				/* Hit the end of the stream. */
-				if(num_conversions == 0)
+				/* Hit the end of the stream. Due to an error? */
+				if(num_conversions == 0 || ferror(stream))
 					goto out;

 				break;
@@ -1548,7 +1563,7 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 						maximum_field_width--;
 				}

-				if(c == EOF && num_chars_processed == 0 && num_conversions == 0)
+				if(c == EOF && ((num_chars_processed == 0 && num_conversions == 0) || ferror(stream)))
 					goto out;
 			}

@@ -1562,6 +1577,7 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 		}
 	}

+	if(num_conversions > 0)
 		result = num_assignments;

 out:
--- a/library/stdlib_data.c
+++ b/library/stdlib_data.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_data.c,v 1.3 2004-11-14 11:06:27 obarthel Exp $
+ * $Id: stdlib_data.c,v 1.2 2004-09-29 14:17:44 obarthel Exp $
 *
 * :ts=4
 *
@@ -84,14 +84,6 @@ ULONG __stk_extensions;

 /****************************************************************************/

-#if defined(__SASC)
-
-UBYTE * __base;
-
-#endif /* __SASC */
-
-/****************************************************************************/
-
 struct Library * __UtilityBase;

 /****************************************************************************/
@@ -99,3 +91,11 @@ struct Library * __UtilityBase;
 #if defined(__amigaos4__)
 struct UtilityIFace * __IUtility;
 #endif /* __amigaos4__ */
+
+/****************************************************************************/
+
+#if defined(__SASC)
+
+UBYTE * __base;
+
+#endif /* __SASC */
--- a/library/stdlib_exit.c
+++ b/library/stdlib_exit.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_exit.c,v 1.2 2004-11-14 11:06:27 obarthel Exp $
+ * $Id: stdlib_exit.c,v 1.1.1.1 2004-07-26 16:31:54 obarthel Exp $
 *
 * :ts=4
 *
@@ -42,6 +42,10 @@ int		__exit_value = RETURN_FAIL;

 /****************************************************************************/

+extern void __exit_trap_trigger(void);
+
+/****************************************************************************/
+
 void
 _exit(int return_code)
 {
--- a/library/stdlib_headers.h
+++ b/library/stdlib_headers.h
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_headers.h,v 1.2 2004-11-14 11:06:27 obarthel Exp $
+ * $Id: stdlib_headers.h,v 1.1.1.1 2004-07-26 16:31:56 obarthel Exp $
 *
 * :ts=4
 *
@@ -157,79 +157,81 @@ struct LocalVariable

 /****************************************************************************/

-extern struct LocalVariable * NOCOMMON __lv_root;
+extern struct LocalVariable * __lv_root;

 /****************************************************************************/

-extern unsigned NOCOMMON __random_seed;
+extern unsigned __random_seed;

 /****************************************************************************/

-extern struct MemoryTree NOCOMMON	__memory_tree;
-extern struct MinList NOCOMMON		__memory_list;
-extern APTR NOCOMMON				__memory_pool;
+extern struct MemoryTree	__memory_tree;
+extern struct MinList		__memory_list;
+extern APTR					__memory_pool;

 /****************************************************************************/

-extern struct MinList NOCOMMON __alloca_memory_list;
+extern struct MinList __alloca_memory_list;

 /****************************************************************************/

-extern unsigned long NOCOMMON __maximum_memory_allocated;
-extern unsigned long NOCOMMON __current_memory_allocated;
-extern unsigned long NOCOMMON __maximum_num_memory_chunks_allocated;
-extern unsigned long NOCOMMON __current_num_memory_chunks_allocated;
+extern unsigned long __maximum_memory_allocated;
+extern unsigned long __current_memory_allocated;
+extern unsigned long __maximum_num_memory_chunks_allocated;
+extern unsigned long __current_num_memory_chunks_allocated;

 /****************************************************************************/

-extern jmp_buf NOCOMMON	__exit_jmp_buf;
-extern int NOCOMMON		__exit_value;
+extern jmp_buf	__exit_jmp_buf;
+extern int		__exit_value;

 /****************************************************************************/

-extern unsigned int NOCOMMON (* __get_default_stack_size)(void);
+extern unsigned int (* __get_default_stack_size)(void);

 /****************************************************************************/

-extern unsigned int NOCOMMON __stack_size;
-extern BOOL NOCOMMON __stack_overflow;
-extern UBYTE * NOCOMMON __stk_limit;
-extern UBYTE * NOCOMMON __base;
+extern unsigned int __stack_size;
+extern BOOL __stack_overflow;
+extern UBYTE * __stk_limit;
+/*extern UBYTE ** __stackborders;*/
+/*extern UBYTE * __SaveSP;*/
+extern UBYTE * __base;

 /****************************************************************************/

-extern ULONG NOCOMMON __stk_argbytes;
-extern ULONG NOCOMMON __stk_safezone;
-extern ULONG NOCOMMON __stk_maxsize;
-extern ULONG NOCOMMON __stk_size;
-extern ULONG NOCOMMON __stk_extensions;
-extern ULONG NOCOMMON __stk_minframe;
+extern ULONG __stk_argbytes;
+extern ULONG __stk_safezone;
+extern ULONG __stk_maxsize;
+extern ULONG __stk_size;
+extern ULONG __stk_extensions;
+extern ULONG __stk_minframe;

 /****************************************************************************/

-extern BOOL NOCOMMON __is_resident;
+extern BOOL __is_resident;

 /****************************************************************************/

-extern BOOL NOCOMMON __free_program_name;
+extern BOOL __free_program_name;

 /****************************************************************************/

-extern UBYTE NOCOMMON __shell_escape_character;
+extern UBYTE __shell_escape_character;

 /****************************************************************************/

-extern char ** NOCOMMON	__argv;
-extern int NOCOMMON		__argc;
+extern char ** __argv;
+extern int __argc;

 /****************************************************************************/

-extern UBYTE * NOCOMMON __quote_vector;
+extern UBYTE * __quote_vector;

 /****************************************************************************/

-extern int NOCOMMON __default_pool_size;
-extern int NOCOMMON __default_puddle_size;
+extern int __default_pool_size;
+extern int __default_puddle_size;

 /****************************************************************************/

--- a/library/stdlib_main.c
+++ b/library/stdlib_main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_main.c,v 1.7 2004-11-14 11:43:30 obarthel Exp $
+ * $Id: stdlib_main.c,v 1.5 2004-10-02 15:56:13 obarthel Exp $
 *
 * :ts=4
 *
@@ -111,8 +111,9 @@ static int
 call_main(void)
 {
 	/* Initialization functions; must be called exactly in this
-	   order because there are dependencies between the
-	   individual functions. */
+	 * order because there are dependencies between the
+	 * individual functions.
+	 */
 	static init_func_ptr init_functions[] =
 	{
 		__stdlib_init,
@@ -128,9 +129,10 @@ call_main(void)
 	};

 	/* Finalization functions; these may be called
-	   essentially in any order. But this one makes the
-	   most sense (roll-back of the corresponding
-	   initialization functions). */
+	 * essentially in any order. But this one makes the
+	 * most sense (roll-back of the corresponding
+	 * initialization functions).
+	 */
 	static exit_func_ptr exit_functions[] =
 	{
 		__stdlib_exit,
@@ -187,18 +189,20 @@ call_main(void)
 	#endif /* __USE_SAS_PROFILING_FOR_MONITORING */

 	/* If we end up here with the __stack_overflow variable
-	   set then the stack overflow handler dropped into
-	   longjmp() and _exit() did not get called. This
-	   means that we will have to show the error message
-	   and invoke _exit() all on our own. */
+	 * set then the stack overflow handler dropped into
+	 * longjmp() and _exit() did not get called. This
+	 * means that we will have to show the error message
+	 * and invoke _exit() all on our own.
+	 */
 	if(__stack_overflow)
 	{
 		SHOWMSG("we have a stack overflow");

 		/* Dump whatever is waiting to be written to the
-		   standard I/O streams, and make sure that no
-		   break signal is about to make things any more
-		   complicated than they already are. */
+		 * standard I/O streams, and make sure that no
+		 * break signal is about to make things any more
+		 * complicated than they already are.
+		 */
 		__check_abort_enabled = FALSE;

 		if(stdout != NULL)
@@ -226,9 +230,10 @@ call_main(void)
 	SHOWMSG("calling the exit functions");

 	/* Any of the following cleanup routines may call
-	   _exit() by way of abort() or through a hook
-	   function. Which is why we redirect the exit
-	   return procedure. */
+	 * _exit() by way of abort() or through a hook
+	 * function. Which is why we redirect the exit
+	 * return procedure.
+	 */
 	for(i = 0 ; exit_functions[i] != NULL ; i++)
 	{
 		D(("calling exit function #%ld",i));
@@ -260,12 +265,13 @@ detach_cleanup(REG(d0, LONG UNUSED unused_return_code),REG(d1, BPTR segment_list
 	if(((struct Library *)DOSBase)->lib_Version < 50)
 	{
 		/* Now for the slightly shady part. We need to unload the segment
-		   list this program was originally loaded with. We have to close
-		   dos.library, though, which means that either we can close the
-		   library or unload the code, but not both. But there's a loophole
-		   in that we can enter Forbid(), unload the code, close the library
-		   and exit and nobody will be able to allocate this program's
-		   memory until after the process has been terminated. */
+		 * list this program was originally loaded with. We have to close
+		 * dos.library, though, which means that either we can close the
+		 * library or unload the code, but not both. But there's a loophole
+		 * in that we can enter Forbid(), unload the code, close the library
+		 * and exit and nobody will be able to allocate this program's
+		 * memory until after the process has been terminated.
+		 */
 		Forbid();

 		UnLoadSeg(segment_list);
@@ -310,7 +316,6 @@ _main(void)
 	int return_code = RETURN_FAIL;
 	ULONG current_stack_size;
 	APTR old_window_pointer;
-	int os_version;

 	SysBase = *(struct Library **)4;

@@ -344,26 +349,13 @@ _main(void)

 	__WBenchMsg = startup_message;

-	/* Check which minimum operating system version we actually require. */
-	os_version = 37;
-	if(__minimum_os_lib_version > 37)
-		os_version = __minimum_os_lib_version;
-
 	/* We will need dos.library V37 and utility.library V37. */
-	DOSBase			= (struct Library *)OpenLibrary("dos.library",os_version);
-	__UtilityBase	= OpenLibrary("utility.library",os_version);
+	DOSBase			= (struct Library *)OpenLibrary("dos.library",37);
+	__UtilityBase	= OpenLibrary("utility.library",37);

 	if(DOSBase == NULL || __UtilityBase == NULL)
 	{
-		char * error_message;
-
-		/* If available, use the error message provided by the client. */
-		if(__minimum_os_lib_error != NULL)
-			error_message = __minimum_os_lib_error;
-		else
-			error_message = "This program requires AmigaOS 2.04 or higher.";
-
-		__show_error(error_message);
+		__show_error("This program requires AmigaOS 2.04 or higher.");
 		goto out;
 	}

@@ -382,8 +374,9 @@ _main(void)
 	#endif /* __amigaos4__ */

 	/* If a callback was provided which can fill us in on which
-	   minimum stack size should be used, invoke it now and
-	   store its result in the global __stack_size variable. */
+	 * minimum stack size should be used, invoke it now and
+	 * store its result in the global __stack_size variable.
+	 */
 	if(__get_default_stack_size != NULL)
 	{
 		unsigned int size;
@@ -397,8 +390,9 @@ _main(void)
 	current_stack_size = get_stack_size(&this_process->pr_Task);

 	/* If this is a resident program, don't allow for the detach
-	   code to run. Same goes for launching the program from
-	   Workbench. */
+	 * code to run. Same goes for launching the program from
+	 * Workbench.
+	 */
 	if(__is_resident || startup_message != NULL)
 	{
 		__detach = FALSE;
@@ -410,17 +404,13 @@ _main(void)
 	}

 	/* The following code will be executed if the program is to keep
-	   running in the shell or was launched from Workbench. */
+	 * running in the shell or was launched from Workbench.
+	 */
 	if(DO_NOT __detach)
 	{
-		int old_priority = this_process->pr_Task.tc_Node.ln_Pri;
-
-		/* Change the task priority, if requested. */
-		if(-128 <= __priority && __priority <= 127)
-			SetTaskPri((struct Task *)this_process,__priority);
-
 		/* Was a minimum stack size requested and do we
-		   need more stack space than was provided for? */
+		 * need more stack space than was provided for?
+		 */
 		if(__stack_size > 0 && current_stack_size < (ULONG)__stack_size)
 		{
 			struct StackSwapStruct * stk;
@@ -462,21 +452,19 @@ _main(void)
 			/* We have enough room to make the call or just don't care. */
 			return_code = call_main();
 		}
-
-		/* Restore the task priority. */
-		SetTaskPri((struct Task *)this_process,old_priority);
 	}
 	else
 	{
 		struct CommandLineInterface * cli = Cli();
-		struct TagItem tags[12];
+		struct TagItem tags[11];
 		UBYTE program_name[256];
 		unsigned int stack_size;
 		int i;

 		/* Now for the interesting part: detach from the shell we're
-		   currently executing in. This works only if the program is
-		   not reentrant and has not been launched from Workbench. */
+		 * currently executing in. This works only if the program is
+		 * not reentrant and has not been launched from Workbench.
+		 */

 		stack_size = __stack_size;

@@ -495,9 +483,9 @@ _main(void)
 		tags[i].	ti_Tag	= NP_StackSize;
 		tags[i++].	ti_Data	= stack_size;
 		tags[i].	ti_Tag	= NP_Name;
-		tags[i++].	ti_Data	= (ULONG)(__process_name != NULL ? (UBYTE *)__process_name : FilePart(program_name));
+		tags[i++].	ti_Data	= (ULONG)program_name;
 		tags[i].	ti_Tag	= NP_CommandName;
-		tags[i++].	ti_Data	= (ULONG)FilePart(program_name);
+		tags[i++].	ti_Data	= (ULONG)program_name;
 		tags[i].	ti_Tag	= NP_Cli;
 		tags[i++].	ti_Data	= TRUE;
 		tags[i].	ti_Tag	= NP_Arguments;
@@ -507,13 +495,6 @@ _main(void)
 		tags[i].	ti_Tag	= NP_ExitData;
 		tags[i++].	ti_Data	= (ULONG)cli->cli_Module;

-		/* Use a predefined task priority, if requested. */
-		if(-128 <= __priority && __priority <= 127)
-		{
-			tags[i].	ti_Tag	= NP_Priority;
-			tags[i++].	ti_Data	= (ULONG)__priority;
-		}
-
 		/* dos.library V50 will free the segment list upon exit. */
 		if(((struct Library *)DOSBase)->lib_Version >= 50)
 		{
@@ -600,10 +581,11 @@ _main(void)
 /****************************************************************************/

 /* The following is automatically called by the main() function through code
-   inserted by GCC. In theory, this could be removed by updating the machine
-   definition, but for now we'll just keep this stub around. It is intended
-   to call the constructor functions, but we do this in our own _main()
-   anyway. */
+ * inserted by GCC. In theory, this could be removed by updating the machine
+ * definition, but for now we'll just keep this stub around. It is intended
+ * to call the constructor functions, but we do this in our own _main()
+ * anyway.
+ */

 #if defined(__GNUC__)

--- a/library/stdlib_mktemp.c
+++ b/library/stdlib_mktemp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_mktemp.c,v 1.3 2004-11-10 17:45:40 obarthel Exp $
+ * $Id: stdlib_mktemp.c,v 1.2 2004-08-07 09:15:32 obarthel Exp $
 *
 * :ts=4
 *
@@ -57,19 +57,16 @@ mktemp(char * name_template)
 {
 	#if defined(UNIX_PATH_SEMANTICS)
 	struct name_translation_info name_template_nti;
+	char * original_name_template = NULL;
 	#endif /* UNIX_PATH_SEMANTICS */
-	char * test_name;
 	struct Process * this_process;
 	APTR old_window_pointer;
 	char * result = NULL;
-	size_t template_offset;
-	size_t template_len;
-	size_t name_len;
-	size_t offset;
+	int template_offset;
+	int template_len;
 	time_t now;
-	ULONG pseudo_random_number;
 	BPTR lock;
-	size_t i;
+	int i;

 	ENTER();

@@ -77,8 +74,6 @@ mktemp(char * name_template)

 	assert(name_template != NULL);

-	this_process = (struct Process *)FindTask(NULL);
-
 	#if defined(CHECK_FOR_NULL_POINTERS)
 	{
 		if(name_template == NULL)
@@ -94,93 +89,13 @@ mktemp(char * name_template)
 	if(__check_abort_enabled)
 		__check_abort();

-	SHOWSTRING(name_template);
-
-	/* So, how long is that name template? */
-	name_len = strlen(name_template);
-	if(name_len == 0)
-	{
-		SHOWMSG("invalid name template");
-
-		errno = EINVAL;
-		goto out;
-	}
-
-	/* Find out how many trailing 'X' characters there are in
-	   the template. There should be at least 6. We also want
-	   to know where to find the first 'X' and how many of the
-	   'X' characters there are. */
-	template_offset	= 0;
-	template_len	= 0;
-
-	for(i = 0 ; i < name_len ; i++)
-	{
-		assert( name_len >= (i + 1) );
-
-		offset = name_len - (i + 1);
-
-		if(name_template[offset] != 'X')
-			break;
-
-		template_offset = offset;
-		template_len++;
-	}
-
-	SHOWVALUE(template_offset);
-	SHOWVALUE(template_len);
-
-	if(template_len == 0)
-	{
-		SHOWMSG("invalid name template");
-
-		errno = EINVAL;
-		goto out;
-	}
-
-	/* Generate a pseudo-random number from the current time and
-	   the address of the current process. */
-	time(&now);
-
-	pseudo_random_number = (ULONG)now + (ULONG)this_process;
-
-	/* Fill the template 'X' characters with letters made up by
-	   converting the pseudo-random number. */
-	for(i = 0 ; i < template_len ; i++)
-	{
-		name_template[template_offset + i] = 'A' + (pseudo_random_number % 26);
-
-		/* One more letter taken; if we run out of letters,
-		   cook up another pseudo-random number. */
-		pseudo_random_number = (pseudo_random_number / 26);
-		if(pseudo_random_number == 0)
-		{
-			time(&now);
-
-			pseudo_random_number = (ULONG)now;
-		}
-	}
-
-	SHOWSTRING(name_template);
-
-	old_window_pointer = this_process->pr_WindowPtr;
-
-	/* Now check if the name we picked is unique. If not, make another name. */
-	while(TRUE)
-	{
-		if(__check_abort_enabled)
-			__check_abort();
-
-		D(("checking '%s'",name_template));
-
-		test_name = name_template;
-
-		/* If necessary, quickly translate the semantics of the file name
-		   we cooked up above. */
 	#if defined(UNIX_PATH_SEMANTICS)
 	{
 		if(__unix_path_semantics)
 		{
-				if(__translate_unix_to_amiga_path_name((char const **)&test_name,&name_template_nti) != 0)
+			original_name_template = name_template;
+
+			if(__translate_unix_to_amiga_path_name((char const **)&name_template,&name_template_nti) != 0)
 				goto out;

 			if(name_template_nti.is_root)
@@ -192,12 +107,62 @@ mktemp(char * name_template)
 	}
 	#endif /* UNIX_PATH_SEMANTICS */

+	SHOWSTRING(name_template);
+
+	template_offset	= -1;
+	template_len	= 0;
+
+	for(i = strlen(name_template)-1 ; i >= 0 ; i--)
+	{
+		if(name_template[i] == 'X')
+		{
+			template_offset = i;
+			template_len++;
+		}
+		else
+		{
+			break;
+		}
+	}
+
+	if(template_offset == -1)
+	{
+		SHOWMSG("invalid name template");
+
+		errno = EINVAL;
+		goto out;
+	}
+
+	this_process = (struct Process *)FindTask(NULL);
+
+	time(&now);
+
+	now += (time_t)this_process;
+
+	for(i = 0 ; i < template_len ; i++)
+	{
+		name_template[template_offset + i] = 'A' + (now % 26);
+
+		now = (now / 26);
+		if(now == 0)
+			time(&now);
+	}
+
+	old_window_pointer = this_process->pr_WindowPtr;
+
+	while(TRUE)
+	{
+		if(__check_abort_enabled)
+			__check_abort();
+
+		D(("checking '%s'",name_template));
+
 		/* Turn off DOS error requesters. */
 		this_process->pr_WindowPtr = (APTR)-1;

 		/* Does this object exist already? */
 		PROFILE_OFF();
-		lock = Lock(test_name,SHARED_LOCK);
+		lock = Lock(name_template,SHARED_LOCK);
 		PROFILE_ON();

 		/* Restore DOS requesters. */
@@ -226,7 +191,8 @@ mktemp(char * name_template)
 		PROFILE_ON();

 		/* Change one letter; if that 'overflows', start
-		   over with 'A' and move on to the next position. */
+		 * over with 'A' and move on to the next position.
+		 */
 		for(i = 0 ; i < template_len ; i++)
 		{
 			name_template[template_offset + i]++;
@@ -239,6 +205,20 @@ mktemp(char * name_template)

 	SHOWSTRING(name_template);

+	#if defined(UNIX_PATH_SEMANTICS)
+	{
+		if(__unix_path_semantics)
+		{
+			if(__translate_amiga_to_unix_path_name((char const **)&name_template,&name_template_nti) != 0)
+				goto out;
+
+			strcpy(original_name_template,name_template);
+		}
+	}
+	#endif /* UNIX_PATH_SEMANTICS */
+
+	SHOWSTRING(name_template);
+
 out:

 	RETURN(result);
--- a/library/stdlib_osliberror.c
+++ b/library/stdlib_osliberror.c
@@ -1,34 +0,0 @@
-/*
- * $Id: stdlib_osliberror.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-2004 by Olaf Barthel <olsen@sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-char * __minimum_os_lib_error;
--- a/library/stdlib_oslibversion.c
+++ b/library/stdlib_oslibversion.c
@@ -1,34 +0,0 @@
-/*
- * $Id: stdlib_oslibversion.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-2004 by Olaf Barthel <olsen@sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-int __minimum_os_lib_version;
--- a/library/stdlib_priority.c
+++ b/library/stdlib_priority.c
@@ -1,36 +0,0 @@
-/*
- * $Id: stdlib_priority.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-2004 by Olaf Barthel <olsen@sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* We use an invalid priority value to indicate "do not change the program's
-   task priority". */
-int __priority = 256;
--- a/library/stdlib_process_name.c
+++ b/library/stdlib_process_name.c
@@ -1,34 +0,0 @@
-/*
- * $Id: stdlib_process_name.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-2004 by Olaf Barthel <olsen@sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-char * __process_name;
--- a/library/stdlib_startup.c
+++ b/library/stdlib_startup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_startup.c,v 1.4 2004-11-14 11:06:27 obarthel Exp $
+ * $Id: stdlib_startup.c,v 1.3 2004-09-29 19:57:58 obarthel Exp $
 *
 * :ts=4
 *
@@ -347,11 +347,7 @@ __startup_init(void)
 		__original_current_directory = CurrentDir(__WBenchMsg->sm_ArgList[0].wa_Lock);
 		__current_directory_changed = TRUE;

-		if (__stdio_window_specification != NULL)
-		{
-			input = Open(__stdio_window_specification,MODE_NEWFILE);	
-		}
-		else if (__WBenchMsg->sm_ToolWindow != NULL)
+		if(__WBenchMsg->sm_ToolWindow != NULL)
 		{
 			input = Open(__WBenchMsg->sm_ToolWindow,MODE_NEWFILE);	
 		}
--- a/library/stdlib_stdio_window_spec.c
+++ b/library/stdlib_stdio_window_spec.c
@@ -1,34 +0,0 @@
-/*
- * $Id: stdlib_stdio_window_spec.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-2004 by Olaf Barthel <olsen@sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-char * __stdio_window_specification;
--- a/library/string_strlcat.c
+++ b/library/string_strlcat.c
@@ -1,140 +0,0 @@
-/*
- * $Id: string_strlcat.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-2004 by Olaf Barthel <olsen@sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/****************************************************************************/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/****************************************************************************/
-
-#ifndef _STDLIB_NULL_POINTER_CHECK_H
-#include "stdlib_null_pointer_check.h"
-#endif /* _STDLIB_NULL_POINTER_CHECK_H */
-
-/****************************************************************************/
-
-#ifndef _STRING_HEADERS_H
-#include "string_headers.h"
-#endif /* _STRING_HEADERS_H */
-
-/****************************************************************************/
-
-/*
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
- * If retval >= siz, truncation occurred.
- */
-size_t
-strlcat(char *dst, const char *src, size_t siz)
-{
-	register char *d = dst;
-	register const char *s = src;
-	register size_t n = siz;
-	size_t result;
-	size_t dlen;
-
-	assert( src != NULL && (siz == 0 || dst != NULL) );
-
-	#if defined(CHECK_FOR_NULL_POINTERS)
-	{
-		if(src == NULL || (siz != 0 && dst == NULL))
-		{
-			errno = EFAULT;
-
-			result = 0;
-			goto out;
-		}
-	}
-	#endif /* CHECK_FOR_NULL_POINTERS */
-
-	/* Find the end of dst and adjust bytes left but don't go past end */
-	while(n-- != 0 && (*d) != '\0')
-		d++;
-
-	dlen = d - dst;
-	n = siz - dlen;
-
-	if (n == 0)
-	{
-		result = dlen + strlen(s);
-	}
-	else
-	{
-		while((*s) != '\0')
-		{
-			if(n != 1)
-			{
-				(*d++) = (*s);
-
-				n--;
-			}
-
-			s++;
-		}
-
-		(*d) = '\0';
-
-		result = dlen + (s - src); /* count does not include NUL */
-	}
-
- out:
-
-	return(result);
-}
--- a/library/string_strlcpy.c
+++ b/library/string_strlcpy.c
@@ -1,130 +0,0 @@
-/*
- * $Id: string_strlcpy.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-2004 by Olaf Barthel <olsen@sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/****************************************************************************/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/****************************************************************************/
-
-#ifndef _STDLIB_NULL_POINTER_CHECK_H
-#include "stdlib_null_pointer_check.h"
-#endif /* _STDLIB_NULL_POINTER_CHECK_H */
-
-/****************************************************************************/
-
-#ifndef _STRING_HEADERS_H
-#include "string_headers.h"
-#endif /* _STRING_HEADERS_H */
-
-/****************************************************************************/
-
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
-size_t
-strlcpy(char *dst, const char *src, size_t siz)
-{
-	register char *d = dst;
-	register const char *s = src;
-	register size_t n = siz;
-	size_t result;
-
-	assert( siz == 0 || (dst != NULL && src != NULL) );
-
-	#if defined(CHECK_FOR_NULL_POINTERS)
-	{
-		if(siz != 0 && (dst == NULL || src == NULL))
-		{
-			errno = EFAULT;
-
-			result = 0;
-			goto out;
-		}
-	}
-	#endif /* CHECK_FOR_NULL_POINTERS */
-
-	/* Copy as many bytes as will fit */
-	if(n != 0 && --n != 0)
-	{
-		do
-		{
-			if(((*d++) = (*s++)) == '\0')
-				break;
-		}
-		while(--n != 0);
-	}
-
-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if(n == 0)
-	{
-		if(siz != 0)
-			(*d) = '\0'; /* NUL-terminate dst */
-
-		while (*s++)
-			;
-	}
-
-	result = (s - src - 1);	/* count does not include NUL */
-
- out:
-
-	return(result);
-}
--- a/library/string_strtok.c
+++ b/library/string_strtok.c
@@ -1,5 +1,5 @@
 /*
- * $Id: string_strtok.c,v 1.4 2004-11-18 09:40:37 obarthel Exp $
+ * $Id: string_strtok.c,v 1.1.1.1 2004-07-26 16:32:20 obarthel Exp $
 *
 * :ts=4
 *
@@ -48,12 +48,58 @@ strtok(char *str, const char *separator_set)
 {
 	static char * last;

-	char * result;
+	char * result = NULL;
+	size_t size;

-	ENTER();
+	assert( separator_set != NULL );

-	result = strtok_r(str,separator_set,&last);
+	#if defined(CHECK_FOR_NULL_POINTERS)
+	{
+		if(separator_set == NULL)
+		{
+			errno = EFAULT;
+			goto out;
+		}
+	}
+	#endif /* CHECK_FOR_NULL_POINTERS */
+
+	/* Did we get called before? Restart at the last valid position. */
+	if(str == NULL)
+	{
+		str = last;
+
+		/* However, we may have hit the end of the
+		   string already. */
+		if(str == NULL)
+			goto out;
+	}
+
+	last = NULL;
+
+	/* Skip the characters which count as
+	   separators. */
+	str += strspn(str, separator_set);
+	if((*str) == '\0')
+		goto out;
+
+	/* Count the number of characters which aren't
+	   separators. */
+	size = strcspn(str, separator_set);
+	if(size == 0)
+		goto out;
+
+	/* This is where the search can resume later. */
+	last = &str[size+1];
+	if((*last) == '\0')
+		last = NULL;
+
+	/* This is the token we found; make sure that
+	   it looks like a valid string. */
+	str[size] = '\0';
+
+	result = str;
+
+ out:

-	RETURN(result);
 	return(result);
 }
--- a/library/string_strtok_r.c
+++ b/library/string_strtok_r.c
@@ -1,112 +0,0 @@
-/*
- * $Id: string_strtok_r.c,v 1.1 2004-11-18 09:40:37 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * 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
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _STDLIB_NULL_POINTER_CHECK_H
-#include "stdlib_null_pointer_check.h"
-#endif /* _STDLIB_NULL_POINTER_CHECK_H */
-
-/****************************************************************************/
-
-#ifndef _STRING_HEADERS_H
-#include "string_headers.h"
-#endif /* _STRING_HEADERS_H */
-
-/****************************************************************************/
-
-char *
-strtok_r(char *str, const char *separator_set,char ** state_ptr)
-{
-	char * result = NULL;
-	char * last;
-	size_t size;
-
-	assert( separator_set != NULL && state_ptr != NULL );
-
-	#if defined(CHECK_FOR_NULL_POINTERS)
-	{
-		if(separator_set == NULL || state_ptr == NULL)
-		{
-			errno = EFAULT;
-			goto out;
-		}
-	}
-	#endif /* CHECK_FOR_NULL_POINTERS */
-
-	last = (*state_ptr);
-
-	/* Did we get called before? Restart at the last valid position. */
-	if(str == NULL)
-	{
-		str = last;
-
-		/* However, we may have hit the end of the
-		   string already. */
-		if(str == NULL)
-			goto out;
-	}
-
-	last = NULL;
-
-	/* Skip the characters which count as
-	   separators. */
-	str += strspn(str, separator_set);
-	if((*str) == '\0')
-		goto out;
-
-	/* Count the number of characters which aren't
-	   separators. */
-	size = strcspn(str, separator_set);
-	if(size == 0)
-		goto out;
-
-	/* This is where the search can resume later. */
-	last = &str[size];
-
-	/* If we didn't hit the end of the string already,
-	   skip the separator. */
-	if((*last) != '\0')
-		last++;
-
-	/* This is the token we found; make sure that
-	   it looks like a valid string. */
-	str[size] = '\0';
-
-	result = str;
-
- out:
-
-	if(state_ptr != NULL)
-		(*state_ptr) = last;
-
-	return(result);
-}
--- a/library/time_asctime.c
+++ b/library/time_asctime.c
@@ -1,5 +1,5 @@
 /*
- * $Id: time_asctime.c,v 1.3 2004-11-18 09:40:37 obarthel Exp $
+ * $Id: time_asctime.c,v 1.1.1.1 2004-07-26 16:32:21 obarthel Exp $
 *
 * :ts=4
 *
@@ -43,16 +43,149 @@

 /****************************************************************************/

+static void
+add_to_string(char * to,int to_size,const char * string,int * offset_ptr)
+{
+	int offset;
+	int len;
+
+	assert( to != NULL && to_size > 0 && string != NULL && offset_ptr != NULL );
+
+	offset = (*offset_ptr);
+
+	assert( offset < to_size );
+
+	len = strlen(string);
+	if(offset + len > (to_size-1))
+		len = (to_size-1) - offset;
+
+	if(len > 0)
+	{
+		memmove(&to[offset],string,(size_t)len);
+		offset += len;
+
+		assert( offset < to_size );
+
+		to[offset] = '\0';
+
+		(*offset_ptr) = offset;
+	}
+}
+
+/****************************************************************************/
+
 char *
 asctime(const struct tm *tm)
 {
 	static char buffer[40];

-	char * result;
+	struct tm copy_tm;
+	char number[16];
+	char * result = NULL;
+	const char * b;
+	int offset = 0;

 	ENTER();

-	result = __asctime_r(tm,buffer,sizeof(buffer));
+	SHOWPOINTER(tm);
+
+	assert( tm != NULL );
+
+	#if defined(CHECK_FOR_NULL_POINTERS)
+	{
+		if(tm == NULL)
+		{
+			errno = EFAULT;
+			goto out;
+		}
+	}
+	#endif /* CHECK_FOR_NULL_POINTERS */
+
+	/* Fill in the week day if it's not in proper range. */
+	if(tm->tm_wday < 0 || tm->tm_wday > 6)
+	{
+		struct tm other_tm;
+		time_t seconds;
+
+		other_tm = (*tm);
+
+		seconds = mktime(&other_tm);
+		if(seconds != (time_t)-1)
+		{
+			__convert_time(seconds,0,&other_tm);
+
+			copy_tm = (*tm);
+			copy_tm.tm_wday = other_tm.tm_wday;
+
+			tm = &copy_tm;
+		}
+	}
+
+	if(0 <= tm->tm_wday && tm->tm_wday <= 6)
+		b = __abbreviated_week_day_names[tm->tm_wday];
+	else
+		b = "---";
+
+	add_to_string(buffer,sizeof(buffer),b,		&offset);
+	add_to_string(buffer,sizeof(buffer)," ",	&offset);
+
+	if(0 <= tm->tm_mon && tm->tm_mon <= 11)
+		b = __abbreviated_month_names[tm->tm_mon];
+	else
+		b = "---";
+
+	add_to_string(buffer,sizeof(buffer),b,		&offset);
+	add_to_string(buffer,sizeof(buffer)," ",	&offset);
+
+	if(1 <= tm->tm_mday && tm->tm_mday <= 31)
+		b = __number_to_string((unsigned int)tm->tm_mday,number,sizeof(number),2);
+	else
+		b = "--";
+
+	add_to_string(buffer,sizeof(buffer),b,		&offset);
+	add_to_string(buffer,sizeof(buffer)," ",	&offset);
+
+	if(0 <= tm->tm_hour && tm->tm_hour <= 23)
+		b = __number_to_string((unsigned int)tm->tm_hour,number,sizeof(number),2);
+	else
+		b = "--";
+
+	add_to_string(buffer,sizeof(buffer),b,		&offset);
+	add_to_string(buffer,sizeof(buffer),":",	&offset);
+
+	if(0 <= tm->tm_min && tm->tm_min <= 59)
+		b = __number_to_string((unsigned int)tm->tm_min,number,sizeof(number),2);
+	else
+		b = "--";
+
+	add_to_string(buffer,sizeof(buffer),b,		&offset);
+	add_to_string(buffer,sizeof(buffer),":",	&offset);
+
+	if(0 <= tm->tm_sec && tm->tm_sec <= 59)
+		b = __number_to_string((unsigned int)tm->tm_sec,number,sizeof(number),2);
+	else
+		b = "--";
+
+	add_to_string(buffer,sizeof(buffer),b,		&offset);
+	add_to_string(buffer,sizeof(buffer)," ",	&offset);
+
+	if(0 <= tm->tm_year)
+		b = __number_to_string((unsigned int)1900 + tm->tm_year,number,sizeof(number),0);
+	else
+		b = "----";
+
+	add_to_string(buffer,sizeof(buffer),b,&offset);
+
+	SHOWSTRING(buffer);
+
+	add_to_string(buffer,sizeof(buffer),"\n",&offset);
+
+	assert( offset < sizeof(buffer) );
+	assert( strlen(buffer) < sizeof(buffer) );
+
+	result = buffer;
+
+ out:

 	RETURN(result);
 	return(result);
--- a/library/time_asctime_r.c
+++ b/library/time_asctime_r.c
@@ -1,205 +0,0 @@
-/*
- * $Id: time_asctime_r.c,v 1.1 2004-11-18 09:40:37 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * 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
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _STDLIB_NULL_POINTER_CHECK_H
-#include "stdlib_null_pointer_check.h"
-#endif /* _STDLIB_NULL_POINTER_CHECK_H */
-
-/****************************************************************************/
-
-#ifndef _TIME_HEADERS_H
-#include "time_headers.h"
-#endif /* _TIME_HEADERS_H */
-
-/****************************************************************************/
-
-static void
-add_to_string(char * to,int to_size,const char * string,int * offset_ptr)
-{
-	int offset;
-	int len;
-
-	assert( to != NULL && to_size > 0 && string != NULL && offset_ptr != NULL );
-
-	offset = (*offset_ptr);
-
-	assert( offset < to_size );
-
-	len = strlen(string);
-	if(offset + len > (to_size-1))
-		len = (to_size-1) - offset;
-
-	if(len > 0)
-	{
-		memmove(&to[offset],string,(size_t)len);
-		offset += len;
-
-		assert( offset < to_size );
-
-		to[offset] = '\0';
-
-		(*offset_ptr) = offset;
-	}
-}
-
-/****************************************************************************/
-
-char *
-__asctime_r(const struct tm *tm,char * buffer,size_t buffer_size)
-{
-	struct tm copy_tm;
-	char number[16];
-	char * result = NULL;
-	const char * b;
-	int offset = 0;
-
-	ENTER();
-
-	SHOWPOINTER(tm);
-
-	assert( tm != NULL || buffer == NULL );
-
-	#if defined(CHECK_FOR_NULL_POINTERS)
-	{
-		if(tm == NULL || buffer == NULL )
-		{
-			errno = EFAULT;
-			goto out;
-		}
-	}
-	#endif /* CHECK_FOR_NULL_POINTERS */
-
-	/* Fill in the week day if it's not in proper range. */
-	if(tm->tm_wday < 0 || tm->tm_wday > 6)
-	{
-		struct tm other_tm;
-		time_t seconds;
-
-		other_tm = (*tm);
-
-		seconds = mktime(&other_tm);
-		if(seconds != (time_t)-1)
-		{
-			__convert_time(seconds,0,&other_tm);
-
-			copy_tm = (*tm);
-			copy_tm.tm_wday = other_tm.tm_wday;
-
-			tm = &copy_tm;
-		}
-	}
-
-	if(0 <= tm->tm_wday && tm->tm_wday <= 6)
-		b = __abbreviated_week_day_names[tm->tm_wday];
-	else
-		b = "---";
-
-	add_to_string(buffer,buffer_size,b,		&offset);
-	add_to_string(buffer,buffer_size," ",	&offset);
-
-	if(0 <= tm->tm_mon && tm->tm_mon <= 11)
-		b = __abbreviated_month_names[tm->tm_mon];
-	else
-		b = "---";
-
-	add_to_string(buffer,buffer_size,b,		&offset);
-	add_to_string(buffer,buffer_size," ",	&offset);
-
-	if(1 <= tm->tm_mday && tm->tm_mday <= 31)
-		b = __number_to_string((unsigned int)tm->tm_mday,number,sizeof(number),2);
-	else
-		b = "--";
-
-	add_to_string(buffer,buffer_size,b,		&offset);
-	add_to_string(buffer,buffer_size," ",	&offset);
-
-	if(0 <= tm->tm_hour && tm->tm_hour <= 23)
-		b = __number_to_string((unsigned int)tm->tm_hour,number,sizeof(number),2);
-	else
-		b = "--";
-
-	add_to_string(buffer,buffer_size,b,		&offset);
-	add_to_string(buffer,buffer_size,":",	&offset);
-
-	if(0 <= tm->tm_min && tm->tm_min <= 59)
-		b = __number_to_string((unsigned int)tm->tm_min,number,sizeof(number),2);
-	else
-		b = "--";
-
-	add_to_string(buffer,buffer_size,b,		&offset);
-	add_to_string(buffer,buffer_size,":",	&offset);
-
-	if(0 <= tm->tm_sec && tm->tm_sec <= 59)
-		b = __number_to_string((unsigned int)tm->tm_sec,number,sizeof(number),2);
-	else
-		b = "--";
-
-	add_to_string(buffer,buffer_size,b,		&offset);
-	add_to_string(buffer,buffer_size," ",	&offset);
-
-	if(0 <= tm->tm_year)
-		b = __number_to_string((unsigned int)1900 + tm->tm_year,number,sizeof(number),0);
-	else
-		b = "----";
-
-	add_to_string(buffer,buffer_size,b,&offset);
-
-	SHOWSTRING(buffer);
-
-	add_to_string(buffer,buffer_size,"\n",&offset);
-
-	assert( offset < buffer_size );
-	assert( strlen(buffer) < buffer_size );
-
-	result = buffer;
-
- out:
-
-	RETURN(result);
-	return(result);
-}
-
-/****************************************************************************/
-
-char *
-asctime_r(const struct tm *tm,char * buffer)
-{
-	char * result;
-
-	ENTER();
-
-	result = __asctime_r(tm,buffer,40);
-
-	RETURN(result);
-	return(result);
-}
--- a/library/time_ctime.c
+++ b/library/time_ctime.c
@@ -1,5 +1,5 @@
 /*
- * $Id: time_ctime.c,v 1.3 2004-11-18 09:40:37 obarthel Exp $
+ * $Id: time_ctime.c,v 1.1.1.1 2004-07-26 16:32:22 obarthel Exp $
 *
 * :ts=4
 *
--- a/library/time_ctime_r.c
+++ b/library/time_ctime_r.c
@@ -1,72 +0,0 @@
-/*
- * $Id: time_ctime_r.c,v 1.1 2004-11-18 09:40:37 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * 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
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _STDLIB_NULL_POINTER_CHECK_H
-#include "stdlib_null_pointer_check.h"
-#endif /* _STDLIB_NULL_POINTER_CHECK_H */
-
-/****************************************************************************/
-
-#ifndef _TIME_HEADERS_H
-#include "time_headers.h"
-#endif /* _TIME_HEADERS_H */
-
-/****************************************************************************/
-
-char *
-ctime_r(const time_t *tptr,char * buffer)
-{
-	char * result = NULL;
-	struct tm tm;
-
-	ENTER();
-
-	assert( tptr != NULL && buffer != NULL );
-
-	#if defined(CHECK_FOR_NULL_POINTERS)
-	{
-		if(tptr == NULL || buffer == NULL)
-		{
-			errno = EFAULT;
-			goto out;
-		}
-	}
-	#endif /* CHECK_FOR_NULL_POINTERS */
-
-	result = asctime_r(localtime_r(tptr,&tm),buffer);
-
- out:
-
-	RETURN(result);
-	return(result);
-}
--- a/library/time_gmtime.c
+++ b/library/time_gmtime.c
@@ -1,5 +1,5 @@
 /*
- * $Id: time_gmtime.c,v 1.3 2004-11-18 09:40:37 obarthel Exp $
+ * $Id: time_gmtime.c,v 1.1.1.1 2004-07-26 16:32:22 obarthel Exp $
 *
 * :ts=4
 *
@@ -47,11 +47,27 @@ struct tm *
 gmtime(const time_t *t)
 {
 	static struct tm tm;
-	struct tm * result;
+	struct tm * result = NULL;

 	ENTER();

-	result = gmtime_r(t,&tm);
+	assert( t != NULL );
+
+	#if defined(CHECK_FOR_NULL_POINTERS)
+	{
+		if(t == NULL)
+		{
+			SHOWMSG("invalid t parameter");
+
+			errno = EFAULT;
+			goto out;
+		}
+	}
+	#endif /* CHECK_FOR_NULL_POINTERS */
+
+	result = __convert_time((*t), 0, &tm);
+
+ out:

 	RETURN(result);
 	return(result);
--- a/library/time_gmtime_r.c
+++ b/library/time_gmtime_r.c
@@ -1,71 +0,0 @@
-/*
- * $Id: time_gmtime_r.c,v 1.1 2004-11-18 09:40:37 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * 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
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _STDLIB_NULL_POINTER_CHECK_H
-#include "stdlib_null_pointer_check.h"
-#endif /* _STDLIB_NULL_POINTER_CHECK_H */
-
-/****************************************************************************/
-
-#ifndef _TIME_HEADERS_H
-#include "time_headers.h"
-#endif /* _TIME_HEADERS_H */
-
-/****************************************************************************/
-
-struct tm *
-gmtime_r(const time_t *t,struct tm * tm_ptr)
-{
-	struct tm * result = NULL;
-
-	ENTER();
-
-	assert( t != NULL && tm_ptr != NULL );
-
-	#if defined(CHECK_FOR_NULL_POINTERS)
-	{
-		if(t == NULL || tm_ptr == NULL)
-		{
-			errno = EFAULT;
-			goto out;
-		}
-	}
-	#endif /* CHECK_FOR_NULL_POINTERS */
-
-	result = __convert_time((*t), 0, tm_ptr);
-
- out:
-
-	RETURN(result);
-	return(result);
-}
--- a/library/time_headers.h
+++ b/library/time_headers.h
@@ -1,5 +1,5 @@
 /*
- * $Id: time_headers.h,v 1.4 2004-11-18 09:40:37 obarthel Exp $
+ * $Id: time_headers.h,v 1.2 2004-09-29 19:57:58 obarthel Exp $
 *
 * :ts=4
 *
@@ -84,14 +84,13 @@

 /****************************************************************************/

-extern const char * const NOCOMMON __abbreviated_week_day_names[7];
-extern const char * const NOCOMMON __week_day_names[7];
-extern const char * const NOCOMMON __abbreviated_month_names[12];
-extern const char * const NOCOMMON __month_names[12];
+extern const char * const __abbreviated_week_day_names[7];
+extern const char * const __week_day_names[7];
+extern const char * const __abbreviated_month_names[12];
+extern const char * const __month_names[12];

 /****************************************************************************/

-extern char * __asctime_r(const struct tm *tm,char * buffer,size_t buffer_size);
 extern char * __number_to_string(unsigned int number,char * string,size_t max_len,size_t min_len);
 extern struct tm * __convert_time(ULONG seconds, LONG gmt_offset, struct tm * tm);

--- a/library/time_localtime.c
+++ b/library/time_localtime.c
@@ -1,5 +1,5 @@
 /*
- * $Id: time_localtime.c,v 1.3 2004-11-18 09:40:37 obarthel Exp $
+ * $Id: time_localtime.c,v 1.1.1.1 2004-07-26 16:32:23 obarthel Exp $
 *
 * :ts=4
 *
@@ -51,12 +51,38 @@ struct tm *
 localtime(const time_t *t)
 {
 	static struct tm tm;
-
-	struct tm * result;
+	struct tm * result = NULL;
+	LONG gmt_offset;

 	ENTER();

-	result = localtime_r(t,&tm);
+	assert( t != NULL );
+
+	#if defined(CHECK_FOR_NULL_POINTERS)
+	{
+		if(t == NULL)
+		{
+			SHOWMSG("invalid t parameter");
+
+			errno = EFAULT;
+			goto out;
+		}
+	}
+	#endif /* CHECK_FOR_NULL_POINTERS */
+
+	/* The time parameter given represents local time and
+	 * must be converted to UTC before we proceed.
+	 */
+	if(__default_locale != NULL)
+		gmt_offset = 60 * __default_locale->loc_GMTOffset;
+	else
+		gmt_offset = 0;
+
+	SHOWVALUE(gmt_offset);
+
+	result = __convert_time((*t), gmt_offset, &tm);
+
+ out:

 	RETURN(result);
 	return(result);
--- a/library/time_localtime_r.c
+++ b/library/time_localtime_r.c
@@ -1,86 +0,0 @@
-/*
- * $Id: time_localtime_r.c,v 1.1 2004-11-18 09:40:37 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * 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
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _STDLIB_NULL_POINTER_CHECK_H
-#include "stdlib_null_pointer_check.h"
-#endif /* _STDLIB_NULL_POINTER_CHECK_H */
-
-/****************************************************************************/
-
-#ifndef _TIME_HEADERS_H
-#include "time_headers.h"
-#endif /* _TIME_HEADERS_H */
-
-#ifndef _LOCALE_HEADERS_H
-#include "locale_headers.h"
-#endif /* _LOCALE_HEADERS_H */
-
-/****************************************************************************/
-
-struct tm *
-localtime_r(const time_t *t,struct tm * tm_ptr)
-{
-	struct tm * result = NULL;
-	LONG gmt_offset;
-
-	ENTER();
-
-	assert( t != NULL && tm_ptr != NULL );
-
-	#if defined(CHECK_FOR_NULL_POINTERS)
-	{
-		if(t == NULL || tm_ptr == NULL)
-		{
-			errno = EFAULT;
-			goto out;
-		}
-	}
-	#endif /* CHECK_FOR_NULL_POINTERS */
-
-	/* The time parameter given represents local time and
-	 * must be converted to UTC before we proceed.
-	 */
-	if(__default_locale != NULL)
-		gmt_offset = 60 * __default_locale->loc_GMTOffset;
-	else
-		gmt_offset = 0;
-
-	SHOWVALUE(gmt_offset);
-
-	result = __convert_time((*t), gmt_offset, tm_ptr);
-
- out:
-
-	RETURN(result);
-	return(result);
-}
--- a/library/unistd_headers.h
+++ b/library/unistd_headers.h
@@ -1,5 +1,5 @@
 /*
- * $Id: unistd_headers.h,v 1.4 2004-11-14 11:06:27 obarthel Exp $
+ * $Id: unistd_headers.h,v 1.3 2004-09-29 19:57:58 obarthel Exp $
 *
 * :ts=4
 *
@@ -42,7 +42,7 @@

 /****************************************************************************/

-extern char NOCOMMON __current_path_name[MAXPATHLEN];
+extern char __current_path_name[MAXPATHLEN];

 /****************************************************************************/

@@ -73,7 +73,7 @@ extern BOOL NOCOMMON __unlock_current_directory;

 /****************************************************************************/

-extern BOOL NOCOMMON __unix_path_semantics;
+extern BOOL __unix_path_semantics;

 /****************************************************************************/

--- a/library/unix.lib_rev.h
+++ b/library/unix.lib_rev.h
@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	184
-#define DATE		"28.11.2004"
-#define VERS		"unix.lib 1.184"
-#define VSTRING		"unix.lib 1.184 (28.11.2004)\r\n"
-#define VERSTAG		"\0$VER: unix.lib 1.184 (28.11.2004)"
+#define REVISION	180
+#define DATE		"23.10.2004"
+#define VERS		"unix.lib 1.180"
+#define VSTRING		"unix.lib 1.180 (23.10.2004)\r\n"
+#define VERSTAG		"\0$VER: unix.lib 1.180 (23.10.2004)"
--- a/library/unix.lib_rev.rev
+++ b/library/unix.lib_rev.rev
@@ -1 +1 @@
-184
+180
--- a/library/usergroup_headers.h
+++ b/library/usergroup_headers.h
@@ -1,5 +1,5 @@
 /*
- * $Id: usergroup_headers.h,v 1.4 2004-11-14 11:06:27 obarthel Exp $
+ * $Id: usergroup_headers.h,v 1.3 2004-09-29 19:57:58 obarthel Exp $
 *
 * :ts=4
 *
@@ -54,14 +54,14 @@ extern struct UserGroupIFace * NOCOMMON __IUserGroup;

 /****************************************************************************/

-extern BOOL NOCOMMON __root_mode;
+extern BOOL __root_mode;

 /****************************************************************************/

-extern int NOCOMMON __root_uid;
-extern int NOCOMMON __root_gid;
-extern int NOCOMMON __root_euid;
-extern int NOCOMMON __root_egid;
+extern int __root_uid;
+extern int __root_gid;
+extern int __root_euid;
+extern int __root_egid;

 /****************************************************************************/

--- a/library/usergroup_init_exit.c
+++ b/library/usergroup_init_exit.c
@@ -1,5 +1,5 @@
 /*
- * $Id: usergroup_init_exit.c,v 1.4 2004-11-14 11:06:27 obarthel Exp $
+ * $Id: usergroup_init_exit.c,v 1.3 2004-09-29 19:57:58 obarthel Exp $
 *
 * :ts=4
 *
@@ -45,11 +45,15 @@

 /****************************************************************************/

-/* Pointer to errno, length == sizeof(long) */
+/* Pointer to errno, length == sizeof(errno) */
 #define UGT_ERRNOLPTR 0x80000004

 /****************************************************************************/

+extern char * __program_name;
+
+/****************************************************************************/
+
 struct Library * NOCOMMON __UserGroupBase;

 /****************************************************************************/