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

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

CVSROOT/checkoutlist

@@ -1,13 +0,0 @@
-# The "checkoutlist" file is used to support additional version controlled
-# administrative files in $CVSROOT/CVSROOT, such as template files.
-#
-# The first entry on a line is a filename which will be checked out from
-# the corresponding RCS file in the $CVSROOT/CVSROOT directory.
-# The remainder of the line is an error message to use if the file cannot
-# be checked out.
-#
-# File format:
-#
-#	[<whitespace>]<filename>[<whitespace><error message>]<end-of-line>
-#
-# comment lines begin with '#'

CVSROOT/commitinfo

@@ -1,15 +0,0 @@
-# The "commitinfo" file is used to control pre-commit checks.
-# The filter on the right is invoked with the repository and a list 
-# of files to check.  A non-zero exit of the filter program will 
-# cause the commit to be aborted.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being committed to, relative
-# to the $CVSROOT.  For the first match that is found, then the remainder
-# of the line is the name of the filter to run.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".

CVSROOT/config

@@ -1,21 +0,0 @@
-# Set this to "no" if pserver shouldn't check system users/passwords
-#SystemAuth=no
-
-# Put CVS lock files in this directory rather than directly in the repository.
-#LockDir=/var/lock/cvs
-
-# Set `TopLevelAdmin' to `yes' to create a CVS directory at the top
-# level of the new working directory when using the `cvs checkout'
-# command.
-#TopLevelAdmin=no
-
-# Set `LogHistory' to `all' or `TOEFWUPCGMAR' to log all transactions to the
-# history file, or a subset as needed (ie `TMAR' logs all write operations)
-#LogHistory=TOEFWUPCGMAR
-
-# Set `RereadLogAfterVerify' to `always' (the default) to allow the verifymsg
-# script to change the log message.  Set it to `stat' to force CVS to verify# that the file has changed before reading it (this can take up to an extra
-# second per directory being committed, so it is not recommended for large
-# repositories.  Set it to `never' (the previous CVS behavior) to prevent
-# verifymsg scripts from changing the log message.
-#RereadLogAfterVerify=always

CVSROOT/cvswrappers

@@ -1,19 +0,0 @@
-# This file affects handling of files based on their names.
-#
-# The -m option specifies whether CVS attempts to merge files.
-#
-# The -k option specifies keyword expansion (e.g. -kb for binary).
-#
-# Format of wrapper file ($CVSROOT/CVSROOT/cvswrappers or .cvswrappers)
-#
-#  wildcard	[option value][option value]...
-#
-#  where option is one of
-#  -f		from cvs filter		value: path to filter
-#  -t		to cvs filter		value: path to filter
-#  -m		update methodology	value: MERGE or COPY
-#  -k		expansion mode		value: b, o, kkv, &c
-#
-#  and value is a single-quote delimited value.
-# For example:
-#*.gif -k 'b'

CVSROOT/editinfo

@@ -1,21 +0,0 @@
-# The "editinfo" file is used to allow verification of logging
-# information.  It works best when a template (as specified in the
-# rcsinfo file) is provided for the logging procedure.  Given a
-# template with locations for, a bug-id number, a list of people who
-# reviewed the code before it can be checked in, and an external
-# process to catalog the differences that were code reviewed, the
-# following test can be applied to the code:
-#
-#   Making sure that the entered bug-id number is correct.
-#   Validating that the code that was reviewed is indeed the code being
-#       checked in (using the bug-id number or a seperate review
-#       number to identify this particular code set.).
-#
-# If any of the above test failed, then the commit would be aborted.
-#
-# Actions such as mailing a copy of the report to each reviewer are
-# better handled by an entry in the loginfo file.
-#
-# One thing that should be noted is the the ALL keyword is not
-# supported.  There can be only one entry that matches a given
-# repository.

CVSROOT/loginfo

@@ -1,27 +0,0 @@
-# The "loginfo" file controls where "cvs commit" log information
-# is sent.  The first entry on a line is a regular expression which must match
-# the directory that the change is being made to, relative to the
-# $CVSROOT.  If a match is found, then the remainder of the line is a filter
-# program that should expect log information on its standard input.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name ALL appears as a regular expression it is always used
-# in addition to the first matching regex or DEFAULT.
-#
-# You may specify a format string as part of the
-# filter.  The string is composed of a `%' followed
-# by a single format character, or followed by a set of format
-# characters surrounded by `{' and `}' as separators.  The format
-# characters are:
-#
-#   s = file name
-#   V = old version number (pre-checkin)
-#   v = new version number (post-checkin)
-#   t = tag or branch name
-#
-# For example:
-#DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog
-# or
-#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog

CVSROOT/modules

@@ -1,26 +0,0 @@
-# Three different line formats are valid:
-#	key	-a    aliases...
-#	key [options] directory
-#	key [options] directory files...
-#
-# Where "options" are composed of:
-#	-i prog		Run "prog" on "cvs commit" from top-level of module.
-#	-o prog		Run "prog" on "cvs checkout" of module.
-#	-e prog		Run "prog" on "cvs export" of module.
-#	-t prog		Run "prog" on "cvs rtag" of module.
-#	-u prog		Run "prog" on "cvs update" of module.
-#	-d dir		Place module in directory "dir" instead of module name.
-#	-l		Top-level directory only -- do not recurse.
-#
-# NOTE:  If you change any of the "Run" options above, you'll have to
-# release and re-checkout any working directories of these modules.
-#
-# And "directory" is a path to a directory relative to $CVSROOT.
-#
-# The "-a" option specifies an alias.  An alias is interpreted as if
-# everything on the right of the "-a" had been typed on the command line.
-#
-# You can encode a module within a module by using the special '&'
-# character to interpose another module into the current module.  This
-# can be useful for creating a module that consists of many directories
-# spread out over the entire source repository.

CVSROOT/notify

@@ -1,12 +0,0 @@
-# The "notify" file controls where notifications from watches set by
-# "cvs watch add" or "cvs edit" are sent.  The first entry on a line is
-# a regular expression which is tested against the directory that the
-# change is being made to, relative to the $CVSROOT.  If it matches,
-# then the remainder of the line is a filter program that should contain
-# one occurrence of %s for the user to notify, and information on its
-# standard input.
-#
-# "ALL" or "DEFAULT" can be used in place of the regular expression.
-#
-# For example:
-#ALL mail -s "CVS notification" %s

CVSROOT/rcsinfo

@@ -1,13 +0,0 @@
-# The "rcsinfo" file is used to control templates with which the editor
-# is invoked on commit and import.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being made to, relative to the
-# $CVSROOT.  For the first match that is found, then the remainder of the
-# line is the name of the file that contains the template.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".

CVSROOT/taginfo

@@ -1,20 +0,0 @@
-# The "taginfo" file is used to control pre-tag checks.
-# The filter on the right is invoked with the following arguments:
-#
-# $1 -- tagname
-# $2 -- operation "add" for tag, "mov" for tag -F, and "del" for tag -d
-# $3 -- repository
-# $4->  file revision [file revision ...]
-#
-# A non-zero exit of the filter program will cause the tag to be aborted.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being committed to, relative
-# to the $CVSROOT.  For the first match that is found, then the remainder
-# of the line is the name of the filter to run.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".

CVSROOT/verifymsg

@@ -1,21 +0,0 @@
-# The "verifymsg" file is used to allow verification of logging
-# information.  It works best when a template (as specified in the
-# rcsinfo file) is provided for the logging procedure.  Given a
-# template with locations for, a bug-id number, a list of people who
-# reviewed the code before it can be checked in, and an external
-# process to catalog the differences that were code reviewed, the
-# following test can be applied to the code:
-#
-#   Making sure that the entered bug-id number is correct.
-#   Validating that the code that was reviewed is indeed the code being
-#       checked in (using the bug-id number or a seperate review
-#       number to identify this particular code set.).
-#
-# If any of the above test failed, then the commit would be aborted.
-#
-# Actions such as mailing a copy of the report to each reviewer are
-# better handled by an entry in the loginfo file.
-#
-# One thing that should be noted is the the ALL keyword is not
-# supported.  There can be only one entry that matches a given
-# repository.

documentation/BUILDING

@@ -1,19 +0,0 @@
-In order to build the library, you need a 'C' compiler (obvious, isn't it?) and
-a set of header files for the networking API definitions. The networking header
-files go into a directory "netinclude" which has to sit in the same directory as
-the source code and the "include" directory you find in there. I'm not currently
-supplying these header files here. Drop me a line, and I'll take care of that.
-
-The SAS/C flavour (smakefile) should get the library built using the "large data"
-model. This rules out the use of residentable programs as the startup code I'm
-using is very primitive (startup.o) and doesn't tinker with A4 relative data
-addressing (and how this may be set up).
-
-There are two makefiles for GCC, each a different flavour. There is "GNUmakefile.68k",
-which will build the library for GCC on the 68k platform ("classic" Amiga). This
-builds all variants of the library, for large data, small data, resident, whatever
-model. It's a lot of work and I don't recommend you do this on a plain 68k machine.
-It will literally (!) take hours. The other makefile flavour is for AmigaOS4 using
-the PowerPC hosted GCC system ("GNUmakefile.os4"). This builds only the large data
-version of the library, but this is usually all you need. Small data support is
-currently not implemented but might follow in the future.

documentation/README

@@ -1,235 +0,0 @@
-An ISO 'C' (1994) compliant runtime library for the Amiga
-=========================================================
-
-1. What is this?
-
-This is my attempt to get Samba 2.2.x ported to the Amiga. My first Amiga
-port required SAS/C and a number of strange tricks had to be pulled to get
-it to support the kind of environment Samba needed. But with the
-introduction of Samba 2.2.x many of those tricks did not work any more,
-which is why I decided to attack the problem at the root, namely the
-runtime library.
-
-Because it was no longer possible to build Samba with SAS/C on the new
-Amiga platform, the idea came up to move development to the GNU 'C'
-compiler. This turned out to be a challenge due to its somewhat
-underdeveloped runtime library and header files. Eventually, I decided to
-rewrite that library from scratch.
-
-
-2. What does it do?
-
-Using "'C' - A reference manual" as a reference I wrote a set of header
-files, then proceeded to implement each single function referenced in them.
-With few exceptions in the area of wide character support, the result
-should be a feature complete implementation of the ISO 'C' (1994) runtime
-library.
-
-Because Samba needs a few POSIX-like routines to be supported, the library
-functionality is complemented by a set of routines described in "Advanced
-programming in the Unix environent". This set is not complete, however. It
-will have to grow even further to accomodate for Samba's needs, but this is
-a good start. I specifically added hooks for integrating socket I/O at a
-later point of time.
-
-This is not a portable implementation of the library in the sense that you
-could move it from one 'C' compiler on one operating system to another.
-This is an Amiga specific implementation.
-
-The library supports floating point math, which is limited to IEEE single
-and double precision or M68881 inline math. There is no support for the
-fast floating point (FFP) format or exclusive IEEE single precision. You
-either get double precision (IEEE math) or extended precision (M68881
-inline math). What it is that you get is determined at compile time. Use
-the IEEE_FLOATING_POINT_SUPPORT preprocessor symbol to activate IEEE math
-code and the M68881_FLOATING_POINT_SUPPORT symbol for M68881 inline math.
-
-Not unlike SAS/C, you can configure a minimum stack size the program is to
-use when it starts up. This is controlled via the '__stack_size' variable
-(see "stdlib_main.c").
-
-I added some amiga.lib and debug.lib functionality to the library, but
-don't count on it to be complete.
-
-
-3. What does it not do?
-
-This library is a departure from the typical 'C' runtime environments of
-the past which had to run on all AmigaOS releases, down to Kickstart 1.1.
-This very library was designed to take advantage of the routines available
-since Kickstart 2.04 was introduced and virtually nobody ever put to use.
-This helps to cut the code size, and it also helps to keep bugs out of the
-library by falling back onto well-tested implementations. However, the
-catch is that the code won't run under Kickstart 1.3 and below. But then
-these operating system releases have been obsolete for more than a decade,
-and you can always go back to a compiler environment which supports them.
-
-Practically all library routines are implemented in a sort of na<6E>ve
-fashion. That is, they contain virtually no optimizations whatsoever. This
-is particularly apparent in workhorses such as memset() or memmove(). But
-then, the issue is easy testability and Amiga platform portability.
-
-There is very little support for amiga.lib functionality. There is
-NewList(), HookEntry(), CallHook(), CallHookA(), the DoMethod() family, the
-RexxVars family, but that's all. If you need more, you would have to
-implement it yourself. Put another way, if you absolutely need
-functionality that is only found in amiga.lib, you really shouldn't need in
-in the first place.
-
-
-4. Where does the source code come from?
-
-I originally thought that it might be helpful to piece this library
-together from various sources, such as the BSD libc. Turned out that this
-code was so 'portable' that it became much more complex than it ought to
-be. Also, some side-effects were present which considerably changed the
-behaviour of the library. For example, the BSD libc uses bcopy() as an
-alias for memcpy(), and unlike memcpy() is documented to, bcopy() supports
-overlapping copies.
-
-Eventually, I wrote virtually all the code myself, borrowing algorithmic
-ideas from the BSD libc and the Manx Aztec 'C' runtime library. Because I
-don't know much about the environment GCC expects, I borrowed code snippets
-from libnix, which was written by Matthias Fleischer and Gunther Nikl. This
-in particular concerns the integer and floating point math support, the
-setjmp/longjmp routines and the startup code. The M68881 inline math code
-comes from the <math-68881.h> file written by Matthew Self
-(self@bayes.arc.nasa.gov).
-
-
-5. Limitations and caveats
-
-There is hardly any documentation on the code I wrote. In part this is due
-to the fact that the code itself is very simple in design. It should speak
-for itself. However, to make a usable runtime library you have to have a
-user documentation as in man pages or autodocs. We will eventually have to
-have autodocs for this library.
-
-The code is currently plastered with assertions and debug code. It is
-therefore much larger than it ought to be and runs much slower than it
-ought to be. For example, the malloc() routine will set the contents of the
-memory allocated to a 'dirty' bit pattern which is likely to break software
-which makes assumptions about its contents. Likewise, the free() routine
-will trash the memory to deallocate with a different 'dirty' bit pattern to
-turn up reuse of memory after deallocation. All these debugging features
-can be disabled by defining the NDEBUG preprocessor symbol at compile time
-(see <assert.h>).
-
-The exception handling in the math code is not particularly effective. For
-one part this is due to the fact that there is no exception handler
-installed by the runtime library when it starts up which could catch and
-process the error conditions the CPU or FPU generates. The idea was to
-provide for a portable runtime library with little to no assembly language
-involved. To make the exception handling complete, such code would be
-necessary.
-
-The library currently builds under SAS/C, but because the 'normal' program
-startup code is not utilized, the base relative (A4) addressing does not
-work. If you are going to test it, use the data=faronly option to compile
-the library and the programs.
-
-If you are going to rebuild the library with SAS/C you will need to
-reassign INCLUDE: to point to the local 'include' directory or things won't
-work.
-
-
-6. Conventions and design issues
-
-You will have noticed the 330+ files in this directory. This is not the
-best way to organize a runtime library, but at least all the bits and
-pieces are in plain sight. Each file stands for the one or two routines it
-contains. The name indicates what routine(s) that might be. Each file name
-is prefixed by the name of the header file in which the corresponding
-routine is defined. So, for example, you will find that "unistd_lchown.c"
-contains the definition of the lchown() routine, which has its prototype
-defined in the <unistd.h> header file.
-
-Internal function and variable names are prefixed with two underscores, as
-in '__stdio_init()'.
-
-All routines attempt to do error checking on their parameters. They will
-either drop into an assert() or set an errno value and refuse to go any
-further. This cuts performance but should help to catch the simple bugs
-quite easily (NULL pointers).
-
-Just like any halfway sane Amiga 'C'<27>runtime library, this one performs its
-^C checking in the I/O routines. Typically once upon entry and in every
-iteration of the loop there might be it will quickly poll the ^C signal and
-drop into raise(SIGINT) in case the signal is set. This is just about the
-safest method to solve the problem and should be much more robust than the
-ixemul approach of 'interrupt anywhere - crash anywhere' using the task
-switch/launch hooks to test for signals.
-
-By default all library routines follow the ISO 'C' conventions in that
-where implementation defined behaviour is permitted, the AmigaOS rules are
-followed. For example, unlink() will by default operate like DeleteFile()
-and rename() will return with an error code set if the name of the
-file/directory to be renamed would collide with an existing directory
-entry. However, your program can set a global variable '__unix_semantics'
-which will cause some routines to perform like their Unix counterparts.
-This is necessary for Samba to work but not a generally desirable feature.
-You have some Unix-like behaviour, but the environment itself is not
-completely Unix- or POSIX-compliant. And it shouldn't be. Don't make the
-mistake of trying to mold the environment into a POSIX emulation. It
-doesn't work; AmigaOS is not Unix.
-
-
-7. The startup code
-
-There are three program startup files provided. The most simplistic is in
-'startup.c' which I use for SAS/C. It just invokes the setup routine which
-eventually calls main() and drops straight into exit().
-
-The ncrt0.S file was adapted from the libnix startup code which sets up the
-base relative data area, if necessary (the SMALL_DATA preprocessor symbol
-must be defined).
-
-The nrcrt0.S file was adapted from libnix startup code, too, and sets up
-the base relative data area for programs to be made resident. Note that the
-geta4() stub is missing here; it wouldn't work in a resident program
-anyway.
-
-The ncrt0.S and nrcrt0.S files are considerably smaller and less complex
-than the libnix code they are based on. This is because in this library
-design all the more complex tasks are performed in the stdlib_main.c file
-rather than in assembly language.
-
-
-8. Documentation
-
-Well, you're reading it. There isn't anything much yet. You can consult the book
-"'C' - A reference manual" and you could look at the Open Group's Single Unix
-Specification at <http://www.opengroup.org/onlinepubs/007904975>.
-
-
-9. Legal status
-
-Because this library is in part based upon free software it would be uncourteous
-not to make it free software itself. The BSD license would probably be
-appropriate here.
-
-The PowerPC math library is based in part on work by Sun Microsystems:
-
-====================================================
-Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
-
-Developed at SunPro, a Sun Microsystems, Inc. business.
-Permission to use, copy, modify, and distribute this
-software is freely granted, provided that this notice
-is preserved.
-====================================================
-
-
-
-10. Contacting the author
-
-The basic work was done by Olaf Barthel during two weeks in July 2002. You
-can reach me at:
-
-   Olaf Barthel
-   Gneisenaustr. 43
-   D-31275 Lehrte
-
-Or via e-mail:
-
-   olsen@sourcery.han.de

library/GNUmakefile.68k

@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.68k,v 1.11 2004-10-07 09:20:44 obarthel Exp $
+# $Id: GNUmakefile.68k,v 1.14 2004-11-13 12:55:39 obarthel Exp $
 #
 # :ts=8
 #
@@ -9,7 +9,7 @@
 CC = gcc
 AR = ar -q
 RANLIB = ranlib
-COPY = copy clone
+COPY = copy clone buf=0
 DELETE = delete all quiet
 MAKEDIR = makedir
 MAKE = make -f GNUmakefile.68k
@@ -487,7 +487,6 @@ MATH_LIB = \
 	stdio_vasprintf.o \
 	stdio_vfprintf.o \
 	stdio_vfscanf.o \
-	stdio_vfscanf.o \
 	stdio_vprintf.o \
 	stdio_vsnprintf.o \
 	stdio_vsprintf.o \
@@ -688,7 +687,6 @@ LIBS_68K := $(LIBC_OBJS)/libc.a $(LIBSTACK_OBJS)/libstack.a $(LIBUNIX_OBJS)/libu
             $(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 := $(LIBS_68K)
 
 ##############################################################################
 
@@ -714,8 +712,8 @@ all: \
 	lib/mainnb.o \
 	lib/mainb.o \
 	lib/mainb32.o \
-	lib/libm.a \
 	lib/libm020/libm.a \
+	lib/libm.a \
 	lib/libb/libm.a \
 	lib/libb/libm020/libm.a \
 	lib/libb32/libm020/libm.a

library/GNUmakefile.os4

@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.os4,v 1.12 2004-10-07 11:03:46 tfrieden Exp $
+# $Id: GNUmakefile.os4,v 1.13 2004-11-13 12:55:39 obarthel Exp $
 #
 # :ts=8
 #
@@ -35,7 +35,6 @@ 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
@@ -43,7 +42,6 @@ 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
@@ -51,6 +49,7 @@ endif
 
 ##############################################################################
 
+# General build rules for all object files and the individual libraries
 %.o : %.c
 	@echo "Compiling $<"
 	@$(CC) -c $(CFLAGS) $<
@@ -67,10 +66,6 @@ $(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 $<
@@ -85,6 +80,7 @@ $(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
@@ -95,7 +91,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
@@ -115,6 +111,7 @@ 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 \
@@ -134,9 +131,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 \
@@ -255,39 +252,36 @@ 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_umodsi3.o \
-	stdlib_udivsi3.o \
-	stdlib_udivsi4.o \
+	stdlib_dosbase.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_putenv.o \
@@ -301,19 +295,25 @@ 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 \
 	strings_strcasecmp.o \
@@ -380,21 +380,21 @@ C_LIB = \
 	unistd_realpath.o \
 	unistd_sleep.o \
 	unistd_symlink.o \
-	unistd_time_delay.o \
 	unistd_timer.o \
+	unistd_time_delay.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 \
@@ -408,12 +408,12 @@ UNIX_LIB = \
 	stat_rmdir.o \
 	stat_stat.o \
 	stdio_fdhookentry.o \
-	stdio_init_exit.o \
-	stdio_locksemaphorename.o \
-	stdio_openiob.o \
 	stdio_fflush.o \
 	stdio_fopen.o \
 	stdio_fopen.o \
+	stdio_init_exit.o \
+	stdio_locksemaphorename.o \
+	stdio_openiob.o \
 	stdio_popen.o \
 	stdio_remove.o \
 	stdio_rename.o \
@@ -443,6 +443,7 @@ 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 \
@@ -492,7 +493,6 @@ MATH_LIB = \
 	stdio_vasprintf.o \
 	stdio_vfprintf.o \
 	stdio_vfscanf.o \
-	stdio_vfscanf.o \
 	stdio_vprintf.o \
 	stdio_vsnprintf.o \
 	stdio_vsprintf.o \
@@ -501,48 +501,7 @@ MATH_LIB = \
 	stdlib_strtod.o \
 	time_difftime.o
 
-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
-
+# All objects files which make up libnet.a
 NET_LIB = \
 	net.lib_rev.o \
 	socket_accept.o \
@@ -586,6 +545,7 @@ NET_LIB = \
 	socket_socket.o \
 	socket_hook_entry.o \
 	socket_hstrerror.o \
+	stat_umask.o \
 	usergroup_crypt.o \
 	usergroup_data.o \
 	usergroup_endgrent.o \
@@ -614,13 +574,12 @@ NET_LIB = \
 	usergroup_setregid.o \
 	usergroup_setreuid.o \
 	usergroup_setsid.o \
-	usergroup_setuid.o \
-	stat_umask.o
+	usergroup_setuid.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 \
@@ -646,8 +605,10 @@ DEBUG_LIB = \
 	debug_kputstr1.o \
 	debug_kputstr2.o \
 	debug_kvprintf1.o \
-	debug_kvprintf2.o
+	debug_kvprintf2.o \
+	debug_level.o
 
+# All objects files which make up libamiga.a
 AMIGA_LIB = \
 	amiga.lib_rev.o \
 	amiga_acrypt.o \
@@ -656,10 +617,17 @@ 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 \
@@ -667,6 +635,7 @@ AMIGA_LIB = \
 	amiga_freeievents.o \
 	amiga_hotkey.o \
 	amiga_invertstring.o \
+	amiga_newlist.o \
 	amiga_rangerand.o \
 	amiga_remtof.o \
 	amiga_setsuperattrs.o \
@@ -675,46 +644,52 @@ AMIGA_LIB = \
 
 ##############################################################################
 
-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 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
 
 ##############################################################################
 
+# The startup object files to be built
+STARTUPS := bcrt0.o bcrtbegin.o bcrtend.o crt0.o crtbegin.o crtend.o mainb.o mainnb.o
 
 ##############################################################################
 
-STARTUPS := crt0.o crtbegin.o crtend.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
 all: \
-	lib/crt0.o \
-	lib/crtbegin.o \
-	lib/crtend.o \
-	lib/mainnb.o \
-	lib/libm.a \
-	lib/small-data/libm.a \
+	lib \
+	lib/soft-float \
+	lib/small-data \
+	small_data \
+	large_data \
+	large_data_softfloat \
 	lib/bcrt0.o \
 	lib/bcrtbegin.o \
 	lib/bcrtend.o \
-	lib/soft-float/libc.a
-
-copy:
-	$(COPY) $(foreach file,$(LIBS),large_data/$(file)) lib
+	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
 
 ##############################################################################
 
+# Delete all object files and libraries
 clean:
-	-$(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
+	-$(DELETE) $(STARTUPS) 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
@@ -734,43 +709,74 @@ version:
 
 ##############################################################################
 
+# Tag all files with a certain version number
 cvs-tag:
 	cvs -q tag V1_`cat c.lib_rev.rev`
 
 ##############################################################################
 
-kitchen_sink: $(TYPE) $(LIBS) $(STARTUPS)
-
-##############################################################################
-
-ifneq (,$(TYPE))
-$(TYPE):
-	$(MAKEDIR) $@
-endif
+# 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)
 
 ##############################################################################
 
+# These create the required subdirectories to store object files and
+# libraries in
 lib:
 	-$(MAKEDIR) $@
 
-lib/small-data:
+lib/small-data: lib
 	-$(MAKEDIR) $@
 
-lib/soft-float:
+lib/soft-float: lib
 	-$(MAKEDIR) $@
 
-lib/libm.a: lib
-	$(MAKE) TYPE=large_data kitchen_sink
+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
 	$(COPY) $(foreach file,$(LIBS),large_data/$(file)) lib
 
-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
+# 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
+	$(COPY) $(foreach file,$(LIBS),small_data/$(file)) lib/small-data
+
+##############################################################################
+
+# Rules to build and move the startup code
 lib/crt0.o : lib crt0.o
 	$(COPY) crt0.o lib
 
@@ -797,22 +803,35 @@ lib/bcrtend.o : lib bcrtend.o
 
 ##############################################################################
 
-$(LIBAMIGA_OBJS)/amiga_hookentry.o : amiga_hookentry.c
-
+# 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).
 $(LIBC_OBJS)/stdlib_getsp.o : stdlib_getsp.c
 
 $(LIBC_OBJS)/stdlib_swapstack.o : stdlib_swapstack.c
 
 $(LIBC_OBJS)/stdlib_setjmp.o : stdlib_setjmp.c
 
-$(LIBSTACK_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
 
 ##############################################################################
 
-$(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
-
+# 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_alloca.o : stdlib_alloca.c stdlib_mem_debug.h
 
 $(LIBC_OBJS)/stdlib_calloc.o : stdlib_calloc.c stdlib_mem_debug.h
@@ -829,6 +848,7 @@ $(LIBC_OBJS)/stdlib_red_black.o : stdlib_red_black.c stdlib_mem_debug.h
 
 ##############################################################################
 
+# Individual build rules for libc.a
 $(LIBC_OBJS) :
 	$(MAKEDIR) $@
 
@@ -839,6 +859,7 @@ $(LIBC_OBJS)/libc.a : $(LIBC_OBJS) $(foreach file,$(C_LIB),$(LIBC_OBJS)/$(file))
 
 ##############################################################################
 
+# Individual build rules for libunix.a
 $(LIBUNIX_OBJS) :
 	$(MAKEDIR) $@
 
@@ -849,26 +870,18 @@ $(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_IEEE),$(LIBM_OBJS)/$(file))
+$(LIBM_OBJS)/libm.a : $(LIBM_OBJS) $(foreach file,$(MATH_LIB),$(LIBM_OBJS)/$(file))
 	-$(DELETE) $@
-	@$(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))
+	@$(AR) $@ $(foreach file,$(MATH_LIB),$(LIBM_OBJS)/$(file))
 	$(RANLIB) $@
 
 ##############################################################################
 
+# Individual build rules for libnet.a
 $(LIBNET_OBJS) :
 	$(MAKEDIR) $@
 
@@ -879,6 +892,7 @@ $(LIBNET_OBJS)/libnet.a : $(LIBNET_OBJS) $(foreach file,$(NET_LIB),$(LIBNET_OBJS
 
 ##############################################################################
 
+# Individual build rules for libdebug.a
 $(LIBDEBUG_OBJS) :
 	$(MAKEDIR) $@
 
@@ -889,6 +903,7 @@ $(LIBDEBUG_OBJS)/libdebug.a : $(LIBDEBUG_OBJS) $(foreach file,$(DEBUG_LIB),$(LIB
 
 ##############################################################################
 
+# Individual build rules for libamiga.a
 $(LIBAMIGA_OBJS) :
 	$(MAKEDIR) $@
 
@@ -899,6 +914,7 @@ $(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
@@ -920,13 +936,3 @@ 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

library/amiga.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#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)"
+#define REVISION	183
+#define DATE		"13.11.2004"
+#define VERS		"amiga.lib 1.183"
+#define VSTRING		"amiga.lib 1.183 (13.11.2004)\r\n"
+#define VERSTAG		"\0$VER: amiga.lib 1.183 (13.11.2004)"

library/amiga.lib_rev.rev

@@ -1 +1 @@
-180
+183

library/amiga_beginio.c

@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_beginio.c,v 1.1.1.1 2004-07-26 16:30:17 obarthel Exp $
+ * $Id: amiga_beginio.c,v 1.2 2004-11-13 12:55:39 obarthel Exp $
  *
  * :ts=4
  *
@@ -37,6 +37,14 @@
 
 /****************************************************************************/
 
+#include "debug.h"
+
+/****************************************************************************/
+
+#ifndef __PPC__
+
+/****************************************************************************/
+
 #if defined(__SASC)
 
 VOID __begin_io(struct IORequest * ior);
@@ -64,10 +72,6 @@ VOID __begin_io(struct IORequest * ior);
 
 /****************************************************************************/
 
-#include "debug.h"
-
-/****************************************************************************/
-
 VOID
 BeginIO(struct IORequest *ior)
 {
@@ -82,3 +86,35 @@ 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__ */

library/amiga_createextio.c

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

library/amiga_createport.c

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

library/amiga_createstdio.c

@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_createstdio.c,v 1.1.1.1 2004-07-26 16:30:18 obarthel Exp $
+ * $Id: amiga_createstdio.c,v 1.2 2004-11-10 14:55:30 obarthel Exp $
  *
  * :ts=4
  *
@@ -44,6 +44,12 @@
 
 /****************************************************************************/
 
+#if defined(CreateStdIO)
+#undef CreateStdIO
+#endif /* CreateStdIO */
+
+/****************************************************************************/
+
 struct IOStdReq *
 CreateStdIO(CONST struct MsgPort * port)
 {

library/amiga_createtask.c

@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_createtask.c,v 1.1.1.1 2004-07-26 16:30:18 obarthel Exp $
+ * $Id: amiga_createtask.c,v 1.2 2004-11-13 12:55:39 obarthel Exp $
  *
  * :ts=4
  *
@@ -31,8 +31,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __PPC__
-
 /****************************************************************************/
 
 #include <exec/libraries.h>
@@ -53,6 +51,10 @@
 
 /****************************************************************************/
 
+#ifndef __PPC__
+
+/****************************************************************************/
+
 /*
  *  Create a task with given name, priority, and stack size.
  *  It will use the default exception and trap handlers for now.
@@ -191,4 +193,44 @@ 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__ */

library/amiga_deleteextio.c

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

library/amiga_deleteport.c

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

library/amiga_deletestdio.c

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

library/amiga_deletetask.c

@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_deletetask.c,v 1.1.1.1 2004-07-26 16:30:19 obarthel Exp $
+ * $Id: amiga_deletetask.c,v 1.2 2004-11-13 12:55:39 obarthel Exp $
  *
  * :ts=4
  *
@@ -41,8 +41,34 @@
 
 /****************************************************************************/
 
+#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__ */

library/c.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#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)"
+#define REVISION	183
+#define DATE		"13.11.2004"
+#define VERS		"c.lib 1.183"
+#define VSTRING		"c.lib 1.183 (13.11.2004)\r\n"
+#define VERSTAG		"\0$VER: c.lib 1.183 (13.11.2004)"

library/c.lib_rev.rev

@@ -1 +1 @@
-180
+183

library/changes

@@ -1,3 +1,62 @@
+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

library/debug.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#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)"
+#define REVISION	183
+#define DATE		"13.11.2004"
+#define VERS		"debug.lib 1.183"
+#define VSTRING		"debug.lib 1.183 (13.11.2004)\r\n"
+#define VERSTAG		"\0$VER: debug.lib 1.183 (13.11.2004)"

library/debug.lib_rev.rev

@@ -1 +1 @@
-180
+183

library/dirent_data.c

@@ -1,5 +1,5 @@
 /*
- * $Id: dirent_data.c,v 1.3 2004-08-07 10:24:04 obarthel Exp $
+ * $Id: dirent_data.c,v 1.4 2004-10-24 20:03:42 obarthel Exp $
  *
  * :ts=4
  *
@@ -38,7 +38,7 @@
 /****************************************************************************/
 
 /* Directories being scanned whose locks need to be freed when shutting down. */
-struct MinList __directory_list;
+struct MinList NOCOMMON __directory_list;
 
 /****************************************************************************/
 

library/dirent_headers.h

@@ -1,5 +1,5 @@
 /*
- * $Id: dirent_headers.h,v 1.1.1.1 2004-07-26 16:30:30 obarthel Exp $
+ * $Id: dirent_headers.h,v 1.2 2004-10-24 20:03:42 obarthel Exp $
  *
  * :ts=4
  *
@@ -42,6 +42,12 @@
 
 /****************************************************************************/
 
+#ifndef _MACROS_H
+#include "macros.h"
+#endif /* _MACROS_H */
+
+/****************************************************************************/
+
 struct DirectoryHandle
 {
 	struct MinNode			dh_MinNode;
@@ -56,7 +62,7 @@ struct DirectoryHandle
 
 /****************************************************************************/
 
-extern struct MinList __directory_list;
+extern struct MinList NOCOMMON __directory_list;
 
 /****************************************************************************/
 

library/m.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#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)"
+#define REVISION	183
+#define DATE		"13.11.2004"
+#define VERS		"m.lib 1.183"
+#define VSTRING		"m.lib 1.183 (13.11.2004)\r\n"
+#define VERSTAG		"\0$VER: m.lib 1.183 (13.11.2004)"

library/m.lib_rev.rev

@@ -1 +1 @@
-180
+183

library/m881.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#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)"
+#define REVISION	183
+#define DATE		"13.11.2004"
+#define VERS		"m881.lib 1.183"
+#define VSTRING		"m881.lib 1.183 (13.11.2004)\r\n"
+#define VERSTAG		"\0$VER: m881.lib 1.183 (13.11.2004)"

library/m881.lib_rev.rev

@@ -1 +1 @@
-180
+183

library/net.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#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)"
+#define REVISION	183
+#define DATE		"13.11.2004"
+#define VERS		"net.lib 1.183"
+#define VSTRING		"net.lib 1.183 (13.11.2004)\r\n"
+#define VERSTAG		"\0$VER: net.lib 1.183 (13.11.2004)"

library/net.lib_rev.rev

@@ -1 +1 @@
-180
+183

library/stack.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#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)"
+#define REVISION	183
+#define DATE		"13.11.2004"
+#define VERS		"stack.lib 1.183"
+#define VSTRING		"stack.lib 1.183 (13.11.2004)\r\n"
+#define VERSTAG		"\0$VER: stack.lib 1.183 (13.11.2004)"

library/stack.lib_rev.rev

@@ -1 +1 @@
-180
+183

library/stdio_openiob.c

@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_openiob.c,v 1.1.1.1 2004-07-26 16:31:37 obarthel Exp $
+ * $Id: stdio_openiob.c,v 1.3 2004-11-03 15:39:04 obarthel Exp $
  *
  * :ts=4
  *
@@ -48,9 +48,7 @@ __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;
@@ -86,78 +84,49 @@ __open_iob(const char *filename, const char *mode, int file_descriptor, int slot
 		}
 	}
 
-	/* 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++)
+	/* The first character selects the access mode: read, write or append. */
+	switch(mode[0])
 	{
-		if(mode[i] == ',')
-		{
-			mode_len = i;
-			break;
-		}
-	}
+		case 'r':
 
-	/* 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");
+			SHOWMSG("read mode");
 
 			open_mode = O_RDONLY;
-		file_flags	= IOBF_READ;
-	}
-	else if (strcmp(actual_mode,"w") == SAME || strcmp(actual_mode,"wb") == SAME)
-	{
-		SHOWMSG("write-only");
+			break;
+
+		case 'w':
+
+			SHOWMSG("write mode");
 
 			open_mode = O_WRONLY | O_CREAT | O_TRUNC;
-		file_flags	= IOBF_WRITE;
-	}
-	else if (strcmp(actual_mode,"a") == SAME || strcmp(actual_mode,"ab") == SAME)
-	{
-		SHOWMSG("write-only; append");
+			break;
+
+		case 'a':
+
+			SHOWMSG("append mode");
 
 			open_mode = O_WRONLY | O_CREAT | O_APPEND;
-		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");
+			break;
 
-		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");
+		default:
 
-		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");
+			D(("unsupported file open mode '%lc'",mode[0]));
 
 			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. */
@@ -193,12 +162,21 @@ __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,
-		IOBF_IN_USE | file_flags | IOBF_NO_NUL);
+		file_flags);
 
 	buffer = NULL;
 

library/stdio_vfscanf.c

@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_vfscanf.c,v 1.3 2004-10-22 10:57:53 obarthel Exp $
+ * $Id: stdio_vfscanf.c,v 1.6 2004-11-08 17:57:52 obarthel Exp $
  *
  * :ts=4
  *
@@ -105,24 +105,12 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 
 		if(isspace(c))
 		{
-			BOOL finished = FALSE;
-
 			/* Skip all blank spaces in the stream. */
 			format++;
 
-			while(TRUE)
+			while((c = __getc(stream)) != EOF)
 			{
-				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))
+				if(isspace(c))
 				{
 					total_num_chars_read++;
 				}
@@ -139,8 +127,17 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 				}
 			}
 
-			if(finished)
+			if(c == EOF)
+			{
+				SHOWMSG("end of file");
+
+				/* Hit the end of the stream? */
+				if(num_conversions == 0)
+					goto out;
+
+				/* Finished... */
 				break;
+			}
 
 			/* Resume scanning. */
 			continue;
@@ -159,8 +156,8 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 			{
 				SHOWMSG("end of file");
 
-				/* Hit the end of the stream. Due to an error? */
-				if(num_conversions == 0 || ferror(stream))
+				/* Hit the end of the stream. */
+				if(num_conversions == 0)
 					goto out;
 
 				break;
@@ -305,9 +302,11 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 				break;
 
 			/* It's a floating point number. */
-			case 'f':
 			case 'e':
+			case 'E':
+			case 'f':
 			case 'g':
+			case 'G':
 
 				conversion_type = 'f';
 				format++;
@@ -321,6 +320,7 @@ __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,21 +339,9 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 		   conversion_type != 'n' &&
 		   conversion_type != '[')
 		{
-			BOOL finished = FALSE;
-
-			while(TRUE)
+			while((c = __getc(stream)) != EOF)
 			{
-				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))
+				if(isspace(c))
 				{
 					total_num_chars_read++;
 				}
@@ -369,9 +357,6 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 					break;
 				}
 			}
-
-			if(finished)
-				break;
 		}
 
 		num_chars_processed = 0;
@@ -428,8 +413,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 or an error occured. */
-					if(num_conversions == 0 || ferror(stream))
+					/* Bail out if we hit the end of the stream. */
+					if(num_conversions == 0)
 						goto out;
 
 					break;
@@ -609,7 +594,7 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 							maximum_field_width--;
 					}
 
-					if(c == EOF && ((num_chars_processed == 0 && num_conversions == 0) || ferror(stream)))
+					if(c == EOF && num_chars_processed == 0 && num_conversions == 0)
 						goto out;
 				}
 
@@ -1200,7 +1185,7 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 					}
 				}
 
-				if(c == EOF && ((num_chars_processed == 0 && num_conversions == 0) || ferror(stream)))
+				if(c == EOF && num_chars_processed == 0 && num_conversions == 0)
 					goto out;
 			}
 
@@ -1306,8 +1291,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. We also bail out if we hit an error. */
-				if(c == EOF && (num_chars_processed == 0 || ferror(stream)))
+				   converted. */
+				if(c == EOF && num_chars_processed == 0 && num_conversions == 0)
 					goto out;
 			}
 
@@ -1430,8 +1415,8 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 			{
 				SHOWMSG("end of file");
 
-				/* Hit the end of the stream. Due to an error? */
-				if(num_conversions == 0 || ferror(stream))
+				/* Hit the end of the stream. */
+				if(num_conversions == 0)
 					goto out;
 
 				break;
@@ -1563,7 +1548,7 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 						maximum_field_width--;
 				}
 
-				if(c == EOF && ((num_chars_processed == 0 && num_conversions == 0) || ferror(stream)))
+				if(c == EOF && num_chars_processed == 0 && num_conversions == 0)
 					goto out;
 			}
 
@@ -1577,7 +1562,6 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
 		}
 	}
 
-	if(num_conversions > 0)
 	result = num_assignments;
 
  out:

library/stdlib_mktemp.c

@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_mktemp.c,v 1.2 2004-08-07 09:15:32 obarthel Exp $
+ * $Id: stdlib_mktemp.c,v 1.3 2004-11-10 17:45:40 obarthel Exp $
  *
  * :ts=4
  *
@@ -57,16 +57,19 @@ 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;
-	int template_offset;
-	int template_len;
+	size_t template_offset;
+	size_t template_len;
+	size_t name_len;
+	size_t offset;
 	time_t now;
+	ULONG pseudo_random_number;
 	BPTR lock;
-	int i;
+	size_t i;
 
 	ENTER();
 
@@ -74,6 +77,8 @@ mktemp(char * name_template)
 
 	assert(name_template != NULL);
 
+	this_process = (struct Process *)FindTask(NULL);
+
 	#if defined(CHECK_FOR_NULL_POINTERS)
 	{
 		if(name_template == NULL)
@@ -89,13 +94,93 @@ 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)
 			{
-			original_name_template = name_template;
-
-			if(__translate_unix_to_amiga_path_name((char const **)&name_template,&name_template_nti) != 0)
+				if(__translate_unix_to_amiga_path_name((char const **)&test_name,&name_template_nti) != 0)
 					goto out;
 
 				if(name_template_nti.is_root)
@@ -107,62 +192,12 @@ 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(name_template,SHARED_LOCK);
+		lock = Lock(test_name,SHARED_LOCK);
 		PROFILE_ON();
 
 		/* Restore DOS requesters. */
@@ -191,8 +226,7 @@ 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]++;
@@ -205,20 +239,6 @@ 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);

library/string_strtok.c

@@ -1,5 +1,5 @@
 /*
- * $Id: string_strtok.c,v 1.1.1.1 2004-07-26 16:32:20 obarthel Exp $
+ * $Id: string_strtok.c,v 1.2 2004-10-25 19:53:15 obarthel Exp $
  *
  * :ts=4
  *
@@ -89,9 +89,12 @@ strtok(char *str, const char *separator_set)
 		goto out;
 
 	/* This is where the search can resume later. */
-	last = &str[size+1];
-	if((*last) == '\0')
-		last = NULL;
+	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. */

library/unix.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#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)"
+#define REVISION	183
+#define DATE		"13.11.2004"
+#define VERS		"unix.lib 1.183"
+#define VSTRING		"unix.lib 1.183 (13.11.2004)\r\n"
+#define VERSTAG		"\0$VER: unix.lib 1.183 (13.11.2004)"

library/unix.lib_rev.rev

@@ -1 +1 @@
-180
+183

test_programs/GNUmakefile.68k

@@ -1,94 +0,0 @@
-#
-# $Id: GNUmakefile.68k,v 1.2 2004-09-10 07:41:13 obarthel Exp $
-#
-# :ts=8
-#
-
-##############################################################################
-
-CC = gcc
-DELETE = delete all quiet
-
-##############################################################################
-
-.c.o:
-	@echo "Compiling $<"
-	@$(CC) -c $(CFLAGS) $<
-
-##############################################################################
-
-#CODE_TYPE := -fbaserel -DSMALL_DATA -m68020-60 -DM68020
-#CODE_TYPE := -fbaserel -DSMALL_DATA -m68000
-#CODE_TYPE := -fbaserel32 -DSMALL_DATA32 -m68020-60 -DM68020
- CODE_TYPE := -m68020-60 -DM68020
-#CODE_TYPE := -m68000
-
-##############################################################################
-
-WARNINGS = \
-	-Wall -W -Wshadow -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
-	-Wundef -Wbad-function-cast -Wmissing-declarations -Wconversion
-
-INCLUDE = -I../library/include
-LIB = -L../library/lib
- OPTIONS = -DNDEBUG -fno-builtin -DNO_INLINE_STDARG -DIEEE_FLOATING_POINT_SUPPORT
-#OPTIONS = -D__MEM_DEBUG -fno-builtin
-#OPTIONS = -DDEBUG -D__MEM_DEBUG -DNO_INLINE_STDARG -fno-builtin
- OPTIMIZE = -O
-#OPTIMIZE = -O2 -fomit-frame-pointer
-#DEBUG = -g2
-
-CFLAGS = $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(CODE_TYPE) $(INCLUDE) $(LIB)
-
-##############################################################################
-
-LIBS = -lm -lc -lgcc
-
-##############################################################################
-
-all: test fgets_test iotest sscanf_test printf_test sprintf_test stack_size_test translate_test
-
-clean:
-	$(DELETE) #?.o #?.map test fgets_test iotest sscanf_test printf_test sprintf_test stack_size_test translate_test
-
-##############################################################################
-
-test : test.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ test.o $(LIBS) -Wl,--cref,-M,-Map=$@.map
-
-fgets_test : fgets_test.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ fgets_test.o $(LIBS) -Wl,--cref,-M,-Map=$@.map
-
-iotest : iotest.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ iotest.o $(LIBS) -Wl,--cref,-M,-Map=$@.map
-
-sscanf_test : sscanf_test.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ sscanf_test.o $(LIBS) -Wl,--cref,-M,-Map=$@.map
-
-printf_test : printf_test.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ printf_test.o $(LIBS) -Wl,--cref,-M,-Map=$@.map
-
-sprintf_test : sprintf_test.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ sprintf_test.o $(LIBS) -Wl,--cref,-M,-Map=$@.map
-
-stack_size_test : stack_size_test.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ stack_size_test.o $(LIBS) -Wl,--cref,-M,-Map=$@.map
-
-translate_test : translate_test.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ translate_test.o -lunix $(LIBS) -Wl,--cref,-M,-Map=$@.map
-
-##############################################################################
-
-mkid:
-	mkid -v #?.(c|h|asm|i)
-
-update:
-	mkid -v -u

test_programs/GNUmakefile.os4

@@ -1,78 +0,0 @@
-#
-# $Id: GNUmakefile.os4,v 1.1 2004-09-29 14:37:10 obarthel Exp $
-#
-# :ts=8
-#
-
-##############################################################################
-
-CC = ppc-amigaos-gcc
-DELETE = rm -r
-
-##############################################################################
-
-.c.o:
-	@echo "Compiling $<"
-	@$(CC) -c $(CFLAGS) $<
-
-##############################################################################
-
-WARNINGS = \
-	-Wall -W -Wshadow -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
-	-Wundef -Wbad-function-cast -Wmissing-declarations -Wconversion
-
-INCLUDE = -I../library/include
-LIB = -L../library/lib
-#OPTIONS = -DNDEBUG -fno-builtin -DNO_INLINE_STDARG -DIEEE_FLOATING_POINT_SUPPORT
-#OPTIONS = -D__MEM_DEBUG -fno-builtin
- OPTIONS = -DDEBUG -D__MEM_DEBUG -DNO_INLINE_STDARG -fno-builtin
- OPTIMIZE = -O
-#OPTIMIZE = -O2 -fomit-frame-pointer
-#DEBUG = -g2
-
-CFLAGS = $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(CODE_TYPE) $(INCLUDE) $(LIB)
-
-##############################################################################
-
-LIBS = -lm -lc
-
-##############################################################################
-
-all: test fgets_test iotest sscanf_test printf_test sprintf_test stack_size_test translate_test
-
-clean:
-	$(DELETE) *.o *.map test fgets_test iotest sscanf_test printf_test sprintf_test stack_size_test translate_test
-
-##############################################################################
-
-test : test.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ test.o $(LIBS) -Wl,--cref,-M,-Map=$@.map
-
-fgets_test : fgets_test.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ fgets_test.o $(LIBS) -Wl,--cref,-M,-Map=$@.map
-
-iotest : iotest.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ iotest.o $(LIBS) -Wl,--cref,-M,-Map=$@.map
-
-sscanf_test : sscanf_test.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ sscanf_test.o $(LIBS) -Wl,--cref,-M,-Map=$@.map
-
-printf_test : printf_test.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ printf_test.o $(LIBS) -Wl,--cref,-M,-Map=$@.map
-
-sprintf_test : sprintf_test.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ sprintf_test.o $(LIBS) -Wl,--cref,-M,-Map=$@.map
-
-stack_size_test : stack_size_test.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ stack_size_test.o $(LIBS) -Wl,--cref,-M,-Map=$@.map
-
-translate_test : translate_test.o
-	@echo "Linking $@"
-	$(CC) $(CFLAGS) -o $@ translate_test.o -lunix $(LIBS) -Wl,--cref,-M,-Map=$@.map

test_programs/README

@@ -1,5 +0,0 @@
-This is a collection of programs I'm using to test the library. These
-are functional tests: the library is supposed to do something, and produce
-a particular result. For example, "printf_test" exercises a bunch of
-output formatting rules. Currently, there is only an smakefile for SAS/C
-to build these programs with.

test_programs/clib-bug.c

@@ -1,74 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-#define LINEBUFLENGTH 180
-
-#define STRIP_LF(str) (str[strlen(str)-1]=0)
-void invert_str(char * in)
-{
-char t;
-while(t=*in)
-	{
-	*in++=~t;
-	}
-}
-
-int main(int i, char *c[])
-{
-char dest_fname[80], in_linebuffer[LINEBUFLENGTH];
-FILE * fileout, * filein;
-
-if(i>1)
-	{
-	sprintf(dest_fname, "%s.c", c[1]);
-
-	fileout=fopen(dest_fname, "w");
-	filein =fopen(c[1], "r");
-
-	if(fileout && filein)
-		{
-		fgets(in_linebuffer, LINEBUFLENGTH, filein);
-		STRIP_LF(in_linebuffer);
-		invert_str(in_linebuffer);
-		fputs("char *s_leading=\"", fileout);
-		fputs(in_linebuffer, fileout);
-		fputs("\";\n", fileout);
-
-		fputs("char *s_messages[]={\n", fileout);
-
-		while(fgets(in_linebuffer, LINEBUFLENGTH, filein))
-			{
-			STRIP_LF(in_linebuffer);
-			invert_str(in_linebuffer);
-
-			fputs("\"", fileout);
-			fputs(in_linebuffer, fileout);
-			fputs("\",\n", fileout);
-			}
-		fputs("};\n", fileout);
-		fputs("unsigned s_mess_num = sizeof(s_messages)/sizeof(char *);\n", fileout);
-		fclose(filein);
-		fclose(fileout);
-		}
-	}
-return 0;
-}
-
-/*
-What's this stuff for ? I use it in SP_Engine to hide the usual bunch of "secret
-messages". As you can see, the strings are simply not'ed .
-This source shows both flaws: fgets() and the missing buffer flush. You can
-change the while() statement with
-
-while(!feof(filein))
-	{
-	fgets(in_linebuffer, LINEBUFLENGTH, filein);
-....
-
-This way you'll workaround the first problem.
-The second issue manifests itself this way: the last two fputs() followed by the
-fclose() don't do anything: no "};\n" and no "unsigned....." lines are output to
-'fileout'. With SAS, it works perfectly. Converting the source to dos.library
-calls also works perfectly. I wonder if there's some kind of strange interaction
-with the dos/shell updates. 
-*/

test_programs/fgets_test.c

@@ -1,41 +0,0 @@
-/*
- * $Id: fgets_test.c,v 1.1.1.1 2004-07-26 16:36:07 obarthel Exp $
- *
- * :ts=4
- */
-
-/****************************************************************************/
-
-#include <string.h>
-#include <stdio.h>
-
-/****************************************************************************/
-
-int
-main(int argc,char ** argv)
-{
-	char line[256];
-	size_t len;
-	FILE * in;
-	int i;
-
-	for(i = 1 ; i < argc ; i++)
-	{
-		in = fopen(argv[i],"rb");
-		if(in != NULL)
-		{
-			while(fgets(line,sizeof(line),in) != NULL)
-			{
-				len = strlen(line);
-				while(len > 0 && (line[len-1] == '\n' || line[len-1] == '\r'))
-					line[--len] = '\0';
-
-				printf("%s\n",line);
-			}
-
-			fclose(in);
-		}
-	}
-
-	return(0);
-}

test_programs/iotest.c

@@ -1,44 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#define FILE_SIZE 2048
-#define WRITE_SIZE 32
-
-char FileData[FILE_SIZE];
-
-void CreateFile(char *filename)
-{
-   FILE *file;
-
-   if (file = fopen(filename,"w")) {
-      memset(FileData,'0',FILE_SIZE);
-      memset(FileData,'-',WRITE_SIZE);
-      fwrite(FileData,1,FILE_SIZE,file);
-      fclose(file);
-   }
-}
-
-void ReadWriteFile(char *filename)
-{
-   FILE *file;
-
-   if (file = fopen(filename,"r+")) {
-      fseek(file,0,SEEK_SET);
-      fread(FileData,1,FILE_SIZE,file);
-      fseek(file,0,SEEK_SET);
-      memset(FileData,'1',WRITE_SIZE);
-      fwrite(FileData,1,WRITE_SIZE,file);
-      fclose(file);
-   }
-}
-
-int main(int argc, char **argv)
-{
-   if (argc > 1) {
-      CreateFile(argv[1]);
-      ReadWriteFile(argv[1]);
-   }
-
-   return 0;
-}

test_programs/printf_g_test.c

@@ -1,12 +0,0 @@
-#include <stdio.h>
-
-int __debug_level = 2;
-
-int main(void)
-{
-	double val = 0.0001;
-
-	printf("%g\n", val);
-
-	return(0);
-}

test_programs/printf_test.c

@@ -1,195 +0,0 @@
-#include <string.h>
-#include <stdio.h>
-
-double x;
-
-void
-print_format_int(const char * format_string,int parameter1,int parameter2)
-{
-	printf("\"");
-	printf(format_string,parameter1);
-	printf("\"\t");
-
-	printf("Value = % d, Format = \"%s\"\n",parameter1,format_string);
-
-	printf("\"");
-	printf(format_string,parameter2);
-	printf("\"\t");
-
-	printf("Value = % d, Format = \"%s\"\n",parameter2,format_string);
-}
-
-void
-print_format_char(const char * format_string,char parameter)
-{
-	printf("\"");
-	printf(format_string,parameter);
-	printf("\"\t");
-
-	printf("Value = '%c', Format = \"%s\"\n",parameter,format_string);
-}
-
-void
-print_format_string(const char * format_string,const char *parameter1,const char *parameter2)
-{
-	printf("\"");
-	printf(format_string,parameter1);
-	printf("\"\t");
-
-	printf("Value = \"%s\", Format = \"%s\"\n",parameter1,format_string);
-
-	printf("\"");
-	printf(format_string,parameter2);
-	printf("\"\t");
-
-	printf("Value = \"%s\", Format = \"%s\"\n",parameter2,format_string);
-}
-
-void
-print_format_float(const char * format_string,double parameter1,double parameter2)
-{
-	printf("\"");
-	printf(format_string,parameter1);
-	printf("\"\t");
-
-	printf("Value = % f, Format = \"%s\"\n",parameter1,format_string);
-
-	printf("\"");
-	printf(format_string,parameter2);
-	printf("\"\t");
-
-	printf("Value = % f, Format = \"%s\"\n",parameter2,format_string);
-}
-
-int
-main(void)
-{
-	/*
-	unsigned long foo[2] = { 0x41f00000, 0 };
-
-	memcpy(&x,foo,sizeof(x));
-
-	printf("%.20g\n",x);
-	*/
-
-	print_format_int("%12d",45,-45);
-	print_format_int("%012d",45,-45);
-	print_format_int("% 012d",45,-45);
-	print_format_int("%+12d",45,-45);
-	print_format_int("%+012d",45,-45);
-	print_format_int("%-12d",45,-45);
-	print_format_int("%- 12d",45,-45);
-	print_format_int("%-+12d",45,-45);
-	print_format_int("%12.4d",45,-45);
-	print_format_int("%-12.4d",45,-45);
-	print_format_int("%12.0d",45,-45);
-
-	printf("\n");
-
-	print_format_int("%14u",45,-45);
-	print_format_int("%014u",45,-45);
-	print_format_int("%#14u",45,-45);
-	print_format_int("%#014u",45,-45);
-	print_format_int("%-14u",45,-45);
-	print_format_int("%-#14u",45,-45);
-	print_format_int("%14.4u",45,-45);
-	print_format_int("%-14.4u",45,-45);
-	print_format_int("%14.0u",45,-45);
-
-	printf("\n");
-
-	print_format_int("%14o",45,-45);
-	print_format_int("%014o",45,-45);
-	print_format_int("%#14o",45,-45);
-	print_format_int("%#014o",45,-45);
-	print_format_int("%-14o",45,-45);
-	print_format_int("%-#14o",45,-45);
-	print_format_int("%14.4o",45,-45);
-	print_format_int("%-14.4o",45,-45);
-	print_format_int("%14.0o",45,-45);
-
-	printf("\n");
-
-	print_format_int("%12x",45,-45);
-	print_format_int("%012x",45,-45);
-	print_format_int("%#12X",45,-45);
-	print_format_int("%#012X",45,-45);
-	print_format_int("%-12x",45,-45);
-	print_format_int("%-#12x",45,-45);
-	print_format_int("%12.4x",45,-45);
-	print_format_int("%-12.4x",45,-45);
-	print_format_int("%12.0x",45,-45);
-
-	printf("\n");
-
-	print_format_char("%12c",'*');
-	print_format_char("%012c",'*');
-	print_format_char("%-12c",'*');
-	print_format_char("%12.0c",'*');
-
-	printf("\n");
-
-	print_format_string("%12s","zap","longish");
-	print_format_string("%12.5s","zap","longish");
-	print_format_string("%012s","zap","longish");
-	print_format_string("%-12s","zap","longish");
-	print_format_string("%12.0s","zap","longish");
-
-	printf("\n");
-
-	print_format_float("%10.2f",12.678,-12.678);
-	print_format_float("%010.2f",12.678,-12.678);
-	print_format_float("% 010.2f",12.678,-12.678);
-	print_format_float("%+10.2f",12.678,-12.678);
-	print_format_float("%+010.2f",12.678,-12.678);
-	print_format_float("%-10.2f",12.678,-12.678);
-	print_format_float("%- 10.2f",12.678,-12.678);
-	print_format_float("%-+10.4f",12.678,-12.678);
-	print_format_float("%f",12.678,-12.678);
-	print_format_float("%10f",12.678,-12.678);
-	print_format_float("%10.0f",12.678,-12.678);
-
-	printf("\n");
-
-	print_format_float("%10.2e",12.678,-12.678);
-	print_format_float("%010.2e",12.678,-12.678);
-	print_format_float("% 010.2e",12.678,-12.678);
-	print_format_float("%+10.2E",12.678,-12.678);
-	print_format_float("%+010.2E",12.678,-12.678);
-	print_format_float("%-10.2e",12.678,-12.678);
-	print_format_float("%- 10.2e",12.678,-12.678);
-	print_format_float("%-+10.2e",12.678,-12.678);
-	print_format_float("%e",12.678,-12.678);
-	print_format_float("%10e",12.678,-12.678);
-	print_format_float("%10.0e",12.678,-12.678);
-
-	printf("\n");
-
-	print_format_float("%10.2g",12.678,-12.678);
-	print_format_float("%010.2g",12.678,-12.678);
-	print_format_float("% 010.2g",12.678,-12.678);
-	print_format_float("%+10.2G",12.678,-12.678);
-	print_format_float("%+010.2G",12.678,-12.678);
-	print_format_float("%-10.2g",12.678,-12.678);
-	print_format_float("%- 10.2g",12.678,-12.678);
-	print_format_float("%-+10.2g",12.678,-12.678);
-	print_format_float("%g",12.678,-12.678);
-	print_format_float("%10g",12.678,-12.678);
-	print_format_float("%10.0g",12.678,-12.678);
-
-	printf("\n");
-
-	print_format_float("%10.2g",0.678,-0.678);
-	print_format_float("%010.2g",0.678,-0.678);
-	print_format_float("% 010.2g",0.678,-0.678);
-	print_format_float("%+10.2G",0.678,-0.678);
-	print_format_float("%+010.2G",0.678,-0.678);
-	print_format_float("%-10.2g",0.678,-0.678);
-	print_format_float("%- 10.2g",0.678,-0.678);
-	print_format_float("%-+10.2g",0.678,-0.678);
-	print_format_float("%g",0.678,-0.678);
-	print_format_float("%10g",0.678,-0.678);
-	print_format_float("%10.0g",0.678,-0.678);
-
-	return(0);
-}

test_programs/smakefile

@@ -1,129 +0,0 @@
-#
-# $Id: smakefile,v 1.2 2004-09-10 07:41:13 obarthel Exp $
-#
-# :ts=8
-#
-
-##############################################################################
-
-.c.o:
-	@echo "Compiling $<"
-	@sc nover $(CFLAGS) $<
-
-.asm.o:
-	@echo "Assembling $<"
-	@asm $(AFLAGS) $<
-
-##############################################################################
-
-# You might want to change this to the directory where your operating system
-# header files are stored. On my system, that's "V:include", but you might
-# get lucky with "sc:include" instead, which is the default for SAS/C.
-INCLUDE_DIR = V:include
-#INCLUDE_DIR = sc:include
-
-##############################################################################
-
-# This is where the header files, the startup code and the c.lib files are
-# stored; see below how this prefix is used.
-LIB = /library/
-
-##############################################################################
-
- OPTIMIZE	= optimize opttime optschedule optinline 
-#DEBUG		= debug=line noopt define=CHECK_FOR_NULL_POINTERS
-#DEBUG		= debug=line
-#DEBUG		= debug=line define=NDEBUG
- DEBUG		= debug=sf noopt
-#DEBUG		= debug=sf noopt define=CHECK_FOR_NULL_POINTERS
-#PROFILE	= profile
- DATA		= data=faronly
-#CODE		= code=far
- CPU		= cpu=060
-MATH		= define=IEEE_FLOATING_POINT_SUPPORT math=IEEE
-SUPPORT		= define=UNIX_PATH_SEMANTICS define=SOCKET_SUPPORT define=USERGROUP_SUPPORT \
-		  define=__C_MACROS__
-
-##############################################################################
-
-CFLAGS = \
-	resopt \
-	nover \
-	memorysize=huge \
-	idlen=64 \
-	commentnest \
-	nostackcheck \
-	stringmerge \
-	errorrexx \
-	$(PROFILE) $(OPTIMIZE) $(CODE) $(DATA) $(CPU) $(MATH) \
-	$(SUPPORT) $(DEBUG)
-
-AFLAGS = \
-	-d -m2
-
-##############################################################################
-
-all: setup test fgets_test iotest sscanf_test printf_test sprintf_test stack_size_test translate_test cleanup
-
-clean:
-	-delete \#?.o \#?.map test fgets_test iotest sscanf_test printf_test sprintf_test stack_size_test translate_test
-
-##############################################################################
-
-setup:
-	@echo "Setting up include: assignment"
-	@assign include: $(LIB)include V:include
-
-cleanup:
-	@echo "Cleaning up include: assignment"
-	@assign include: sc:include
-
-##############################################################################
-
-test: test.o
-	@echo "Linking $@"
-	@slink $(LIB)startup.o test.o to $@ lib $(LIB)c.lib addsym \
-		map $@.map,fhx fwidth 32 pwidth 32 swidth 32
-
-fgets_test: fgets_test.o
-	@echo "Linking $@"
-	@slink $(LIB)startup.o fgets_test.o to $@ lib $(LIB)c.lib addsym \
-		map $@.map,fhx fwidth 32 pwidth 32 swidth 32
-
-iotest: iotest.o
-	@echo "Linking $@"
-	@slink $(LIB)startup.o iotest.o to $@ lib $(LIB)c.lib addsym \
-		map $@.map,fhx fwidth 32 pwidth 32 swidth 32
-
-sscanf_test: sscanf_test.o
-	@echo "Linking $@"
-	@slink $(LIB)startup.o sscanf_test.o to $@ lib $(LIB)c.lib addsym \
-		map $@.map,fhx fwidth 32 pwidth 32 swidth 32
-
-printf_test: printf_test.o
-	@echo "Linking $@"
-	@slink $(LIB)startup.o printf_test.o to $@ lib $(LIB)c.lib addsym \
-		map $@.map,fhx fwidth 32 pwidth 32 swidth 32
-
-sprintf_test: sprintf_test.o
-	@echo "Linking $@"
-	@slink $(LIB)startup.o sprintf_test.o to $@ lib $(LIB)c.lib addsym \
-		map $@.map,fhx fwidth 32 pwidth 32 swidth 32
-
-stack_size_test: stack_size_test.o
-	@echo "Linking $@"
-	@slink $(LIB)startup.o stack_size_test.o to $@ lib $(LIB)c.lib addsym \
-		map $@.map,fhx fwidth 32 pwidth 32 swidth 32
-
-translate_test: translate_test.o
-	@echo "Linking $@"
-	@slink $(LIB)startup.o translate_test.o to $@ lib $(LIB)c.lib addsym \
-		map $@.map,fhx fwidth 32 pwidth 32 swidth 32
-
-##############################################################################
-
-mkid:
-	mkid \#?.(c|h|asm|i) include/\#?.(c|h|asm|i) include/sys/\#?.(c|h|asm|i)
-
-update:
-	mkid -v -u

test_programs/sprintf_test.c

@@ -1,25 +0,0 @@
-#include <string.h>
-#include <stdio.h>
-
-static char buf[256];
-
-void addsomething(void)
-{
-  char *p = &buf[strlen(buf)];
-  sprintf(p, "yeah");
-}
-
-int main(void)
-{
-  buf[0] = '\0';
-
-  addsomething();
-  printf("1: [%s]\n", buf);
-
-  sprintf(buf, "");
-
-  addsomething();
-  printf("2: [%s]\n", buf);
-
-  return (0);
-}

test_programs/sscanf_test.c

@@ -1,96 +0,0 @@
-#include <string.h>
-#include <stdio.h>
-
-int
-main(void)
-{
-	int first, second, num;
-	int n,a,b,c;
-	char str[4];
-
-	num = sscanf("6", "%d %d", &first, &second);
-
-	printf("%s:%d:",__FILE__,__LINE__);printf("%d %d\n", num, first);
-
-	a = b = c = 0;
-	n = sscanf("","%*d,%d,%d",&a,&b,&c);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, a = %d, b = %d, c = %d\n",n,a,b,c);
-
-	a = b = c = 0;
-	n = sscanf("1,2,3","%*d,%d,%d",&a,&b,&c);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, a = %d, b = %d, c = %d\n",n,a,b,c);
-
-	a = b = c = 0;
-	n = sscanf("1,2","%*d,%d,%d",&a,&b,&c);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, a = %d, b = %d, c = %d\n",n,a,b,c);
-
-	a = b = c = 0;
-	n = sscanf("asdf","*d,d,d",&a,&b,&c);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, a = %d, b = %d, c = %d\n",n,a,b,c);
-
-	memset(str,0,sizeof(str));
-	n = sscanf("asdf","%[abc]",str);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, str = '%s'\n",n,str);
-
-	memset(str,0,sizeof(str));
-	n = sscanf("asdbbfc","%[abc]",str);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, str = '%s'\n",n,str);
-
-	memset(str,0,sizeof(str));
-	n = sscanf("","%[abc]",str);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, str = '%s'\n",n,str);
-
-	memset(str,0,sizeof(str));
-	n = sscanf("abcdef","%[abc]",str);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, str = '%s'\n",n,str);
-
-	a = b = c = 0;
-	n = sscanf("-","%d",&a);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, a = %d\n",n,a);
-
-	a = b = c = 0;
-	n = sscanf("-4,-","%d,%d",&a,&b);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, a = %d, b = %d\n",n,a,b);
-
-	memset(str,0,sizeof(str));
-	n = sscanf("1 abc","%d %4c",&a,str);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, a = %d, str = '%s'\n",n,a,str);
-
-	memset(str,0,sizeof(str));
-	n = sscanf("abc","%4c",&a,str);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, str = '%s'\n",n,str);
-	
-	a = 0;
-	n = sscanf("17","%i",&a);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, a = %d\n",n,a);
-
-	a = 0;
-	n = sscanf("017","%i",&a);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, a = %d\n",n,a);
-
-	a = 0;
-	n = sscanf("0x17","%i",&a);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, a = %d\n",n,a);
-
-	a = 0;
-	n = sscanf("0x017","%i",&a);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, a = %d\n",n,a);
-
-	a = 0;
-	n = sscanf("0x017","%x",&a);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, a = %d\n",n,a);
-
-	a = 0;
-	n = sscanf("0017","%x",&a);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, a = %d\n",n,a);
-
-	a = 0;
-	n = sscanf("0x80000000","%i",&a);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, a = %u\n",n,a);
-
-	memset(str,0,sizeof(str));
-	n = sscanf("1,e","%*d,%[abc]",str);
-	printf("%s:%d:",__FILE__,__LINE__);printf("n = %d, str = '%s'\n",n,str);
-
-	return(0);
-}

test_programs/stack_extension_test.c

@@ -1,31 +0,0 @@
-/* gcc -mstackextend -o stack_extension_test stack_extension_test.c */
-
-#include <stdio.h>
-#include <ctype.h>
-
-void
-recursive_function(char *data,int data_size,int level)
-{
-	char local_data[10000];
-	char line[10];
-	int c;
-
-	data_size += sizeof(local_data);
-	level++;
-
-	printf("recursion level=%d, size=%d; continue? ",level,data_size);
-
-	fgets(line,sizeof(line),stdin);
-	c = toupper(line[0]);
-
-	if(c == 'Y')
-		recursive_function(local_data,data_size,level);
-}
-
-int
-main(int argc,char ** argv)
-{
-	recursive_function(NULL,0,0);
-
-	return(0);
-}

test_programs/stack_size_test.c

@@ -1,15 +0,0 @@
-#include <stdio.h>
-
-int __stack_size = 60000;
-
-int
-main(void)
-{
-	int first, second, num;
-
-	num = sscanf("6", "%d %d", &first, &second);
-
-	printf("%d %d\n", num, first);
-
-	return(0);
-}

test_programs/test.c

@@ -1,241 +0,0 @@
-/*
- * $Id: test.c,v 1.1.1.1 2004-07-26 16:36:08 obarthel Exp $
- *
- * :ts=4
- */
-
-/****************************************************************************/
-
-#include <time.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <math.h>
-#include <sys/stat.h>
-
-/****************************************************************************/
-
-/*int __stack_size = 20000;*/
-
-/****************************************************************************/
-
-#if defined(__GNUC__)
-
-void __attribute__ ((constructor))
-constructor_test1(void)
-{
-	fprintf(stderr,"constructor #1 called\n");
-}
-
-void __attribute__ ((constructor))
-constructor_test2(void)
-{
-	fprintf(stderr,"constructor #2 called\n");
-}
-
-void __attribute__ ((destructor))
-destructor_test1(void)
-{
-	fprintf(stderr,"destructor #1 called\n");
-}
-
-void __attribute__ ((destructor))
-destructor_test2(void)
-{
-	fprintf(stderr,"destructor #2 called\n");
-}
-
-void __attribute__ ((destructor))
-destructor_test3(void)
-{
-	fprintf(stderr,"destructor #3 called\n");
-}
-
-#endif /* __GNUC__ */
-
-/****************************************************************************/
-
-int foo = 3;
-int bar = 9;
-
-/****************************************************************************/
-
-#if 1
-int
-main(int argc,char ** argv)
-{
-	time_t now;
-	int i,j,k;
-	long n,r;
-
-	for(i = 0 ; i < argc ; i++)
-		printf("%2d) \"%s\"\n",i,argv[i]);
-
-	printf("div %d mod %d\n",foo / 2,bar % 4);
-
-	time(&now);
-	printf("%s",ctime(&now));
-
-	#if defined(IEEE_FLOATING_POINT_SUPPORT) || defined(M68881_FLOATING_POINT_SUPPORT)
-	{
-		const double pi = 3.14159265358979323846;
-		const double ten = 10.0;
-		const double quarter = 0.25;
-		const double thousand = 1000.0;
-		const double foo = 4 * atan((double)1);
-		float f1;
-		double d1;
-
-		printf("pi=%3.1f (float)\n",pi);
-		printf("pi=%.21e (exponential)\n",pi);
-		printf("pi=%g (float/exponential)\n",pi);
-
-		printf("ten=%f (float)\n",ten);
-		printf("ten=%.21e (exponential)\n",ten);
-		printf("ten=%g (float/exponential)\n",ten);
-
-		printf("thousand=%f (float)\n",thousand);
-		printf("thousand=%.21e (exponential)\n",thousand);
-		printf("thousand=%g (float/exponential)\n",thousand);
-
-		printf("quarter=%f (float)\n",quarter);
-		printf("quarter=%.21e (exponential)\n",quarter);
-		printf("quarter=%g (float/exponential)\n",quarter);
-
-		printf("foo=%f (float)\n",foo);
-		printf("foo=%.21e (exponential)\n",foo);
-		printf("foo=%g (float/exponential)\n",foo);
-
-		printf("32 bit float = %f\n",4294967295.0);
-		printf("32+1 bit float = %f\n",-4294967295.0);
-		printf("big float on the edge = %f\n",4294967296.0);
-		printf("big float = %f\n",429496729654321.0);
-		printf("small float = %f\n",-429496729654321.0);
-
-		f1 = d1 = 9;
-
-		r = sscanf("13.24 1.324","%f %lf",&f1,&d1);
-		printf("r = %ld, f1 = %f, d1 = %f\n",r,f1,d1);
-	}
-	#endif
-
-	#ifndef NDEBUG
-	{
-		char * allocation;
-
-		allocation = malloc(4);
-		if(allocation != NULL)
-		{
-			strcpy(allocation,"....FOO");
-			strcpy(allocation-3,"bar");
-		}
-	}
-	#endif /* NDEBUG */
-
-	printf("hex 0x%08x\n",1);
-	printf("hex 0x%08x\n",1);
-	printf("hex 0x%08x\n",2);
-	printf("big int %d\n",0x80000000L);
-	printf("converted big int %d\n",atoi("-2147483648"));
-
-	r = sscanf("1324","%lx",&n);
-	printf("r = %ld, n = %ld\n",r,n);
-
-	r = sscanf("1234567890","%4d%3d%3d",&i,&j,&k);
-	printf("r = %ld, i = %d, j = %d, k = %d\n",r,i,j,k);
-
-	/*#if defined(IEEE_FLOATING_POINT_SUPPORT) || defined(M68881_FLOATING_POINT_SUPPORT)
-	{
-		const char *arg = "100x100";
-		float xres = 0, yres = 0;
-
-		printf("%d: ", sscanf(arg, "%fx%f", &xres, &yres));
-		printf("%.02fx%.02f\n", xres, yres);
-	}
-	#endif*/
-
-	if(argc > 1)
-	{
-		DIR * dir;
-
-		dir = opendir(argv[1]);
-		if(dir != NULL)
-		{
-			struct dirent *d;
-			struct stat st;
-
-			chdir(argv[1]);
-
-			while((d = readdir(dir)) != NULL)
-			{
-				if(stat(d->d_name,&st) == 0)
-					printf("%s%s\n",d->d_name,S_ISDIR(st.st_mode) ? " (dir)" : "");
-			}
-
-			closedir(dir);
-		}
-	}
-
-	return(0);
-}
-#endif
-
-/****************************************************************************/
-
-#if 0
-
-#define LINEBUFLENGTH 180
-
-#define STRIP_LF(str) (str[strlen(str)-1]=0)
-void invert_str(char * in)
-{
-char t;
-while(t=*in)
-	{
-	*in++=~t;
-	}
-}
-
-int main(int i, char *c[])
-{
-char dest_fname[80], in_linebuffer[LINEBUFLENGTH];
-FILE * fileout, * filein;
-
-if(i>1)
-	{
-	sprintf(dest_fname, "%s.c", c[1]);
-
-	fileout=fopen(dest_fname, "w");
-	filein =fopen(c[1], "r");
-
-	if(fileout && filein)
-		{
-		fgets(in_linebuffer, LINEBUFLENGTH, filein);
-		STRIP_LF(in_linebuffer);
-		invert_str(in_linebuffer);
-		fputs("char *s_leading=\"", fileout);
-		fputs(in_linebuffer, fileout);
-		fputs("\";\n", fileout);
-
-		fputs("char *s_messages[]={\n", fileout);
-
-		while(fgets(in_linebuffer, LINEBUFLENGTH, filein))
-			{
-			STRIP_LF(in_linebuffer);
-			invert_str(in_linebuffer);
-
-			fputs("\"", fileout);
-			fputs(in_linebuffer, fileout);
-			fputs("\",\n", fileout);
-			}
-		fputs("};\n", fileout);
-		fputs("unsigned s_mess_num = sizeof(s_messages)/sizeof(char *);\n", fileout);
-		fclose(filein);
-		fclose(fileout);
-		}
-	}
-return 0;
-}
-
-#endif

test_programs/translate_test.c

@@ -1,39 +0,0 @@
-/*
- * $Id: translate_test.c,v 1.1.1.1 2004-07-26 16:36:08 obarthel Exp $
- *
- * :ts=4
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <dos.h>
-
-extern char __current_path_name[];
-
-int
-main(int argc,char ** argv)
-{
-	struct name_translation_info nti;
-	char * name;
-	int error;
-	int i;
-
-	/*strcpy(__current_path_name,"/absolute_path_name/whatever");*/
-
-	for(i = 1 ; i < argc ; i++)
-	{
-		name = argv[i];
-
-		printf("'%s' -> ",name);
-
-		error = __translate_unix_to_amiga_path_name(&name,&nti);
-		/*error = __translate_amiga_to_unix_path_name(&name,&nti);*/
-		if(error == 0)
-			printf("'%s'\n",name);
-		else
-			printf("%s\n",strerror(error));
-	}
-
-	return(0);
-}