From: Sebastian Hammer <quinn@indexdata.com>
Date: Mon, 10 Apr 1995 10:23:49 +0000 (+0000)
Subject: Fixes.
X-Git-Tag: YAZ.1.8~1069
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=f3dd50f81c9aed6768a88b253615d6667cd92a35

Fixes.
---

diff --git a/util/Makefile b/util/Makefile
index b6623b5..7ae36fd 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,24 +1,27 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.4 1995-03-30 14:03:32 quinn Exp $
+# $Id: Makefile,v 1.5 1995-04-10 10:23:49 quinn Exp $
 
 SHELL=/bin/sh
 INCLUDE=-I../include -I.
-LIBDIR=../../lib
+LIBDIR=../lib
 LIBINCLUDE=-L$(LIBDIR)
 #CFLAGS=-g -Wall -pedantic -ansi
 DEFS=$(INCLUDE)
 LIB=$(LIBDIR)/libutil.a
 LIBS=
-PO = dmalloc.o options.o log.o
+PO = dmalloc.o options.o log.o marcdisp.o
 CPP=$(CC) -E
 
-all: $(LIBDIR) $(LIB)
+all: $(LIBDIR) $(LIB) marcdump
 
 #test: test.o $(LIB) ../odr/odr.a
 #	$(CC) $(CFLAGS) $(INCLUDE) -o test test.o $(LIB) ../odr/odr.a
 
+marcdump: marcdump.o $(LIB)
+	$(CC) $(CFLAGS) $(INCLUDE) -o marcdump marcdump.o $(LIB)
+
 alll:
 
 $(LIB): $(PO)
@@ -35,7 +38,7 @@ $(LIBDIR):
 clean:
 	rm -f *.[oa] test core mon.out gmon.out errlist
 
-depend: depend2
+depend: depend1
 
 depend1:
 	mv Makefile Makefile.tmp
@@ -46,8 +49,31 @@ 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
+dmalloc.o : dmalloc.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 /usr/include/stdio.h \
+  /usr/include/libio.h /usr/include/_G_config.h /usr/include/string.h 
+log.o : log.c ../include/log.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/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 /usr/include/ctype.h \
+  /usr/lib/gcc-lib/i486-linux/2.5.8/include/stdarg.h 
+marcdisp.o : marcdisp.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/string.h /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h \
+  /usr/include/ctype.h ../include/marcdisp.h 
+marcdump.o : marcdump.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/marcdisp.h 
+options.o : options.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/options.h 
+query.o : query.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/ctype.h /usr/include/string.h \
+  /usr/lib/gcc-lib/i486-linux/2.5.8/include/stddef.h ../include/odr.h ../include/prt.h \
+  ../include/dmalloc.h ../include/proto.h ../include/odr_use.h 
diff --git a/util/dmalloc.c b/util/dmalloc.c
index b2847b4..c7f2754 100644
--- a/util/dmalloc.c
+++ b/util/dmalloc.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dmalloc.c,v $
- * Revision 1.1  1995-03-27 08:35:17  quinn
+ * Revision 1.2  1995-04-10 10:23:50  quinn
+ * Fixes.
+ *
+ * Revision 1.1  1995/03/27  08:35:17  quinn
  * Created util library
  * Added memory debugging module. Imported options-manager
  *
@@ -26,7 +29,7 @@ void *d_malloc(char *file, int line, int nbytes)
 
     if (!(res = malloc(nbytes + 3 * sizeof(long))))
     	return 0;
-    fprintf(stderr, "---d_malloc, '%s':%d, %d->0x%p\n",
+    fprintf(stderr, "---d_malloc, '%s':%d, %d->%p\n",
     	file, line, nbytes, res + 2 * sizeof(long));
     len = nbytes;
     memcpy(res, &head, sizeof(long));
@@ -46,7 +49,7 @@ void d_free(char *file, int line, char *ptr)
     memcpy(&len, ptr - sizeof(long), sizeof(long));
     if (memcmp(ptr + len, &tail, sizeof(long)))
     	abort();
-    fprintf(stderr, "---d_free, '%s':%d, 0x%p (%d)\n",
+    fprintf(stderr, "---d_free, '%s':%d, %p (%d)\n",
     	file, line, ptr, len);
     free(ptr - 2 * sizeof(long));
     return;
@@ -65,7 +68,7 @@ void *d_realloc(char *file, int line, char *ptr, int nbytes)
     	abort();
     if (!(r = realloc(ptr, nbytes + 3 * sizeof(long))))
     	return 0;
-    fprintf(stderr, "---d_realloc, '%s':%d, %d->%d, 0x%p->0x%p\n",
+    fprintf(stderr, "---d_realloc, '%s':%d, %d->%d, %p->%p\n",
     	file, line, len, nbytes, p, r + 2 * sizeof(long));
     memcpy(r, &head, sizeof(long));
     memcpy(r + sizeof(long), &nlen, sizeof(long));
diff --git a/util/log.c b/util/log.c
index 318adbd..c025120 100644
--- a/util/log.c
+++ b/util/log.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: log.c,v $
- * Revision 1.2  1995-03-31 10:16:55  quinn
+ * Revision 1.3  1995-04-10 10:23:51  quinn
+ * Fixes.
+ *
+ * Revision 1.2  1995/03/31  10:16:55  quinn
  * Fixed logging.
  *
  * Revision 1.1  1995/03/30  10:26:53  quinn
@@ -66,6 +69,16 @@ static struct {
     { 0, NULL }
 };  
 
+#ifndef strerror
+
+char *strerror(int n)
+{
+        extern char *sys_errlist[];
+        return sys_errlist[n];
+}
+
+#endif
+
 void log_init(int level, const char *prefix, const char *name)
 {
     l_level = level;