From ded00c0d1c0dc38e63b2c48ff8cbb12c1b60c70f Mon Sep 17 00:00:00 2001 From: Robert de Bath Date: Wed, 29 Jan 2003 21:07:56 +0100 Subject: Import Dev86src-0.16.11.tar.gz --- libc/Makefile | 20 +++++++------------ libc/include/malloc.h | 30 ---------------------------- libc/include/regexp.h | 21 -------------------- libc/include/regmagic.h | 5 ----- libc/include/string.h | 53 ------------------------------------------------- libc/kinclude/Makefile | 4 +--- libc/malloc/Makefile | 2 +- libc/regexp/Makefile | 1 + libc/string/Makefile | 2 +- 9 files changed, 11 insertions(+), 127 deletions(-) delete mode 100644 libc/include/malloc.h delete mode 100644 libc/include/regexp.h delete mode 100644 libc/include/regmagic.h delete mode 100644 libc/include/string.h (limited to 'libc') diff --git a/libc/Makefile b/libc/Makefile index d5887b2..7d1ceb9 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -52,11 +52,10 @@ transfer: .config.dir @for i in `cat .config.dir`; do \ grep -s '^transfer' $$i/Makefile && $(MAKE) -s -C $$i $@ ; \ done ; echo -n - @[ -f kinclude/Used ] || \ - { rm -f include/linuxmt include/arch ; \ - ln -s $(ELKSSRC)/include/linuxmt include ; \ - ln -s $(ELKSSRC)/include/arch include ; \ - } + @[ -d include/linuxmt/. ] || \ + ln -s $(ELKSSRC)/include/linuxmt include + @[ -d include/arch/. ] || \ + ln -s $(ELKSSRC)/include/arch include ############################################################################ @@ -70,16 +69,11 @@ clean: ############################################################################ -install_incl: +install_incl: transfer install -d $(BCCHOME)/include rm -f $(BCCHOME)/include/linuxmt $(BCCHOME)/include/arch ||: - cp -pr include/* $(BCCHOME)/include - if [ ! -f kinclude/Used ] ; \ - then rm -rf $(BCCHOME)/include/linuxmt $(BCCHOME)/include/arch ; \ - ln -s $(ELKSSRC)/include/linuxmt $(BCCHOME)/include ; \ - ln -s $(ELKSSRC)/include/arch $(BCCHOME)/include ; \ - fi - -chown -R root:root $(BCCHOME)/include 2>/dev/null + cp -Lpr include/* $(BCCHOME)/include + -chown -R root:root $(BCCHOME)/include -chmod -R u=rwX,og=rX $(BCCHOME)/include ############################################################################ diff --git a/libc/include/malloc.h b/libc/include/malloc.h deleted file mode 100644 index e8fdb0a..0000000 --- a/libc/include/malloc.h +++ /dev/null @@ -1,30 +0,0 @@ - -#ifndef __MALLOC_H -#define __MALLOC_H -#include -#include - -/* - * Mini malloc allows you to use a less efficient but smaller malloc the - * cost is about 100 bytes of code in free but malloc (700bytes) doesn't - * have to be linked. Unfortunatly memory can only be reused if everything - * above it has been freed - * - */ - -extern void free __P((void *)); -extern void *malloc __P((size_t)); -extern void *realloc __P((void *, size_t)); -extern void *alloca __P((size_t)); - -extern void *(*__alloca_alloc) __P((size_t)); - -#ifdef __LIBC__ -#define __MINI_MALLOC__ -#endif - -#ifdef __MINI_MALLOC__ -#define malloc(x) ((*__alloca_alloc)(x)) -#endif - -#endif diff --git a/libc/include/regexp.h b/libc/include/regexp.h deleted file mode 100644 index 73d6bf4..0000000 --- a/libc/include/regexp.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Definitions etc. for regexp(3) routines. - * - * Caveat: this is V8 regexp(3) [actually, a reimplementation thereof], - * not the System V one. - */ -#define NSUBEXP 10 -typedef struct regexp { - char *startp[NSUBEXP]; - char *endp[NSUBEXP]; - char regstart; /* Internal use only. */ - char reganch; /* Internal use only. */ - char *regmust; /* Internal use only. */ - int regmlen; /* Internal use only. */ - char program[1]; /* Unwarranted chumminess with compiler. */ -} regexp; - -extern regexp *regcomp(); -extern int regexec(); -extern void regsub(); -extern void regerror(); diff --git a/libc/include/regmagic.h b/libc/include/regmagic.h deleted file mode 100644 index 5acf447..0000000 --- a/libc/include/regmagic.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * The first byte of the regexp internal "program" is actually this magic - * number; the start node begins in the second byte. - */ -#define MAGIC 0234 diff --git a/libc/include/string.h b/libc/include/string.h deleted file mode 100644 index 2233bf9..0000000 --- a/libc/include/string.h +++ /dev/null @@ -1,53 +0,0 @@ - -#ifndef __STRING_H -#define __STRING_H -#include -#include -#include - -/* Basic string functions */ -extern size_t strlen __P ((__const char* __str)); - -extern char * strcat __P ((char*, __const char*)); -extern char * strcpy __P ((char*, __const char*)); -extern int strcmp __P ((__const char*, __const char*)); - -extern char * strncat __P ((char*, char*, size_t)); -extern char * strncpy __P ((char*, char*, size_t)); -extern int strncmp __P ((__const char*, __const char*, size_t)); - -extern char * strchr __P ((char*, int)); -extern char * strrchr __P ((char*, int)); -extern char * strdup __P ((char*)); - -/* Basic mem functions */ -extern void * memcpy __P ((void*, __const void*, size_t)); -extern void * memccpy __P ((void*, void*, int, size_t)); -extern void * memchr __P ((__const void*, __const int, size_t)); -extern void * memset __P ((void*, int, size_t)); -extern int memcmp __P ((__const void*, __const void*, size_t)); - -extern void * memmove __P ((void*, void*, size_t)); - -/* Minimal (very!) locale support */ -#define strcoll strcmp -#define strxfrm strncpy - -/* BSDisms */ -#define index strchr -#define rindex strrchr - -/* Other common BSD functions */ -extern int strcasecmp __P ((char*, char*)); -extern int strncasecmp __P ((char*, char*, size_t)); -char *strpbrk __P ((char *, char *)); -char *strsep __P ((char **, char *)); -char *strstr __P ((char *, char *)); -char *strtok __P ((char *, char *)); -size_t strcspn __P ((char *, char *)); -size_t strspn __P ((char *, char *)); - -/* Linux silly hour */ -char *strfry __P ((char *)); - -#endif diff --git a/libc/kinclude/Makefile b/libc/kinclude/Makefile index 7722d68..dd26b5d 100644 --- a/libc/kinclude/Makefile +++ b/libc/kinclude/Makefile @@ -9,8 +9,6 @@ transfer: -@rm -f ../include/linuxmt ../include/arch ln -s ../kinclude/linuxmt ../include ln -s ../kinclude/arch ../include - @touch Used clean: - -@rm -f ../include/linuxmt ../include/arch - -@rm -f Used + -rm -f ../include/linuxmt ../include/arch diff --git a/libc/malloc/Makefile b/libc/malloc/Makefile index e762582..b083b2e 100644 --- a/libc/malloc/Makefile +++ b/libc/malloc/Makefile @@ -15,7 +15,7 @@ $(LIBC)($(AOBJ)): $(ASRC) $(AR) $(ARFLAGS) $@ $*.o clean: - rm -f *.o libc.a + rm -f *.o libc.a ../include/malloc.h transfer: -@rm ../include/malloc.h diff --git a/libc/regexp/Makefile b/libc/regexp/Makefile index c99c22e..a5ad0d8 100644 --- a/libc/regexp/Makefile +++ b/libc/regexp/Makefile @@ -23,3 +23,4 @@ $(LIBC)(regsub.o): regsub.c regexp.h regmagic.h clean: rm -f libc.a *.o core mon.out timer.t.h dMakefile dtr try timer + rm -f ../include/regexp.h ../include/regmagic.h diff --git a/libc/string/Makefile b/libc/string/Makefile index 0f47b40..a19ac0e 100644 --- a/libc/string/Makefile +++ b/libc/string/Makefile @@ -26,4 +26,4 @@ transfer: cp -p string.h ../include/. clean: - rm -f *.o + rm -f *.o ../include/string.h -- cgit v1.2.1