summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Downs <downsj@cvs.openbsd.org>1997-02-06 22:57:04 +0000
committerJason Downs <downsj@cvs.openbsd.org>1997-02-06 22:57:04 +0000
commitdc706f1f441dbdaa5214115bbe398f1fdb59e9c3 (patch)
treefdc4b72aa8aeb3afb31aae0f91f70b0a4bb198b7
parentbd08e1566b056a638c555df39e8085bf9537f8e2 (diff)
* remove reference to non-existant fat.c.
* make cread.c work with libz again.
-rw-r--r--sys/lib/libsa/Makefile4
-rw-r--r--sys/lib/libsa/cread.c9
2 files changed, 6 insertions, 7 deletions
diff --git a/sys/lib/libsa/Makefile b/sys/lib/libsa/Makefile
index 26e1a0fff13..0c796eca8d9 100644
--- a/sys/lib/libsa/Makefile
+++ b/sys/lib/libsa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 1997/02/06 14:22:32 mickey Exp $
+# $OpenBSD: Makefile,v 1.14 1997/02/06 22:57:03 downsj Exp $
# $NetBSD: Makefile,v 1.13 1996/10/02 16:19:51 ws Exp $
LIB= sa
@@ -38,7 +38,7 @@ SRCS+= close.c closeall.c dev.c disklabel.c dkcksum.c cons.c ioctl.c \
lseek.c open.c nullfs.c read.c stat.c fstat.c write.c
# boot filesystems
-SRCS+= ufs.c cd9660.c fat.c
+SRCS+= ufs.c cd9660.c
.if defined(SA_ZLIB)
SRCS+= cread.c
diff --git a/sys/lib/libsa/cread.c b/sys/lib/libsa/cread.c
index b5fdbc9ee99..93e9204f413 100644
--- a/sys/lib/libsa/cread.c
+++ b/sys/lib/libsa/cread.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cread.c,v 1.3 1997/02/06 06:28:52 mickey Exp $ */
+/* $OpenBSD: cread.c,v 1.4 1997/02/06 22:57:03 downsj Exp $ */
/* $NetBSD: cread.c,v 1.2 1997/02/04 18:38:20 thorpej Exp $ */
/*
@@ -47,7 +47,7 @@
*/
#include "stand.h"
-#include "zlib.h"
+#include "../libz/zlib.h"
#define EOF (-1) /* needed by compression code */
@@ -91,12 +91,11 @@ unsigned size;
return(alloc(items * size));
}
-void zfree (opaque, ptr, size)
+void zcfree (opaque, ptr)
void *opaque;
void *ptr;
-size_t size;
{
- free(ptr, size);
+ free(ptr, 0); /* XXX works only with modified allocator */
}
static int get_byte(s)