From 7b336b394526b31a4c76063e5f63ae3b11d39dda Mon Sep 17 00:00:00 2001 From: Sebastian Hammer Date: Mon, 10 Apr 1995 10:23:10 +0000 Subject: [PATCH] Smallish changes. --- odr/Makefile | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++---- odr/odr.c | 9 +++-- rfc1006/Makefile | 4 +-- 3 files changed, 104 insertions(+), 11 deletions(-) diff --git a/odr/Makefile b/odr/Makefile index d8802a2..e9d2e92 100644 --- a/odr/Makefile +++ b/odr/Makefile @@ -1,13 +1,13 @@ # Copyright (C) 1994, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.14 1995-03-30 14:02:59 quinn Exp $ +# $Id: Makefile,v 1.15 1995-04-10 10:23:10 quinn Exp $ SHELL=/bin/sh INCLUDE=-I../include -I. -LIBDIR=../../lib +LIBDIR=../lib LIBINCLUDE=-L$(LIBDIR) -CFLAGS= -g -Wall -pedantic -ansi #-DODR_DEBUG +CFLAGS= -g -Wall -pedantic -ansi # -DODR_DEBUG DEFS=$(INCLUDE) LIB=$(LIBDIR)/libodr.a LIBS=-lodr @@ -38,7 +38,7 @@ $(LIBDIR): clean: rm -f *.[oa] test core mon.out gmon.out errlist -depend: depend2 +depend: depend1 depend1: mv Makefile Makefile.tmp @@ -49,8 +49,96 @@ depend1: depend2: $(CPP) $(INCLUDE) -M *.c >.depend -ifeq (.depend,$(wildcard .depend)) -include .depend -endif +#ifeq (.depend,$(wildcard .depend)) +#include .depend +#endif #Depend --- DOT NOT DELETE THIS LINE +ber_any.o : ber_any.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +ber_bit.o : ber_bit.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +ber_bool.o : ber_bool.c /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ + /usr/include/libio.h /usr/include/_G_config.h ../include/odr.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +ber_int.o : ber_int.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h \ + /usr/include/sys/types.h /usr/include/linux/types.h /usr/include/netinet/in.h \ + /usr/include/sys/socket.h /usr/include/linux/socket.h /usr/include/linux/sockios.h \ + /usr/include/linux/in.h +ber_len.o : ber_len.c /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ + /usr/include/libio.h /usr/include/_G_config.h ../include/odr.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +ber_null.o : ber_null.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +ber_oct.o : ber_oct.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +ber_oid.o : ber_oid.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +ber_tag.o : ber_tag.c /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ + /usr/include/libio.h /usr/include/_G_config.h ../include/odr.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +odr.o : odr.c /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/stdlib.h /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h \ + /usr/include/errno.h /usr/include/linux/errno.h /usr/lib/gcc-lib/i486-linux/2.5.8/include/float.h \ + /usr/include/alloca.h ../include/odr.h /usr/include/string.h ../include/prt.h \ + ../include/dmalloc.h +odr_any.o : odr_any.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +odr_bit.o : odr_bit.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +odr_bool.o : odr_bool.c /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ + /usr/include/libio.h /usr/include/_G_config.h ../include/odr.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +odr_choice.o : odr_choice.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +odr_cons.o : odr_cons.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +odr_int.o : odr_int.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +odr_mem.o : odr_mem.c /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h /usr/include/errno.h /usr/include/linux/errno.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/float.h /usr/include/alloca.h ../include/odr.h \ + /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + ../include/prt.h ../include/dmalloc.h +odr_null.o : odr_null.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +odr_oct.o : odr_oct.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +odr_oid.o : odr_oid.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +odr_priv.o : odr_priv.c +odr_seq.o : odr_seq.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h \ + /usr/include/assert.h +odr_tag.o : odr_tag.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h +odr_use.o : odr_use.c ../include/odr.h /usr/include/stdio.h /usr/include/features.h \ + /usr/include/sys/cdefs.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h \ + ../include/odr_use.h +odr_util.o : odr_util.c /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h /usr/include/errno.h /usr/include/linux/errno.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/float.h /usr/include/alloca.h ../include/odr.h \ + /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h \ + ../include/prt.h ../include/dmalloc.h +test.o : test.c /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ + /usr/include/libio.h /usr/include/_G_config.h ../include/odr.h /usr/include/string.h \ + /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/prt.h ../include/dmalloc.h \ + ../include/odr_use.h diff --git a/odr/odr.c b/odr/odr.c index 24b15b3..2691c65 100644 --- a/odr/odr.c +++ b/odr/odr.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: odr.c,v $ - * Revision 1.8 1995-03-17 10:17:43 quinn + * Revision 1.9 1995-04-10 10:23:11 quinn + * Smallish changes. + * + * Revision 1.8 1995/03/17 10:17:43 quinn * Added memory management. * * Revision 1.7 1995/03/10 11:44:41 quinn @@ -72,7 +75,7 @@ ODR odr_createmem(int direction) if (!(r = malloc(sizeof(*r)))) return 0; r->direction = direction; - r->print = stdout; + r->print = stderr; r->buf = 0; r->buflen = 0; r->mem = 0; @@ -96,6 +99,8 @@ void odr_reset(ODR o) void odr_destroy(ODR o) { odr_release_mem(o->mem); + if (o->print != stderr) + fclose(o->print); free(o); } diff --git a/rfc1006/Makefile b/rfc1006/Makefile index a71aa0d..d9bc770 100644 --- a/rfc1006/Makefile +++ b/rfc1006/Makefile @@ -1,11 +1,11 @@ # Copyright (C) 1994, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.1 1995-03-30 14:03:17 quinn Exp $ +# $Id: Makefile,v 1.2 1995-04-10 10:23:17 quinn Exp $ SHELL=/bin/sh INCLUDE=-I../include -I. -I../../xtimosi/src -LIBDIR=../../lib +LIBDIR=../lib LIBINCLUDE=-L$(LIBDIR) CFLAGS= -g -Wall -pedantic -ansi DEFS=$(INCLUDE) -- 1.7.10.4