diff --git a/library/GNUmakefile.68k b/library/GNUmakefile.68k index 245f8d5..5703b84 100644 --- a/library/GNUmakefile.68k +++ b/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.12 2004-10-24 20:03:36 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 @@ -108,7 +108,7 @@ INCLUDES = -Iinclude -I. -Inetinclude #OPTIONS = -DDEBUG -D__MEM_DEBUG -DNO_INLINE_STDARG -fno-builtin OPTIMIZE = -O #OPTIMIZE = -O2 -fomit-frame-pointer -#DEBUG = -g2 + DEBUG = -g2 CFLAGS = $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(CODE_TYPE) $(INCLUDES) @@ -688,7 +688,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 +713,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 diff --git a/library/changes b/library/changes index e61ea8e..6503ddb 100644 --- a/library/changes +++ b/library/changes @@ -1,3 +1,8 @@ +- 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 diff --git a/library/dirent_data.c b/library/dirent_data.c index 859d824..db0cbe0 100644 --- a/library/dirent_data.c +++ b/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; /****************************************************************************/ diff --git a/library/dirent_headers.h b/library/dirent_headers.h index 839126e..dd3a143 100644 --- a/library/dirent_headers.h +++ b/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; /****************************************************************************/