d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes needed for kzip to work.

Browse Source
This commit is contained in:
Poul-Henning Kamp 1995-04-15 06:54:13 +00:00
parent 61eaec4e49
commit 194c19ed17
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=7840
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/kern/inflate.c
View File

@ -7,19 +7,23 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
* $Id: inflate.c,v 1.3 1994/10/11 11:29:11 csgr Exp $
* $Id: inflate.c,v 1.4 1994/10/22 11:40:28 phk Exp $
*
*
*/
#include <sys/param.h>
#include <sys/inflate.h>
#ifdef KERNEL
#include <sys/systm.h>
#endif
#include <sys/mman.h>
#include <sys/malloc.h>
#ifdef KERNEL
#include <vm/vm.h>
#include <vm/vm_kern.h>
#endif
/* needed to make inflate() work */
#define uch u_char
@ -27,9 +31,16 @@
#define ulg u_long
/* Stuff to make inflate() work */
#ifdef KERNEL
#define memzero(dest,len) bzero(dest,len)
#endif
#define NOMEMCPY
#ifdef KERNEL
#define FPRINTF printf
#else
extern void putstr (char *);
#define FPRINTF putstr
#endif
#define FLUSH(x,y) { \
int foo = (*x->gz_output)(x->gz_private,x->gz_slide,y); \
@ -39,6 +50,11 @@
static const int qflag = 0;
#ifndef KERNEL /* want to use this file in kzip also */
extern unsigned char *malloc (int, int, int);
extern void free (void*, int);
#endif
/*
* This came from unzip-5.12. I have changed it the flow to pass
* a structure pointer around, thus hopefully making it re-entrant.
@ -430,7 +446,12 @@ huft_build(glbl, b, n, s, d, e, t, m)
/* Generate counts for each bit length */
el = n > 256 ? b[256] : BMAX; /* set length of EOB code, if any */
#ifdef KERNEL
memzero((char *) c, sizeof(c));
#else
for (i = 0; i < BMAX+1; i++)
c [i] = 0;
#endif
p = b;
i = n;
do {
@ -847,7 +868,6 @@ inflate_dynamic(glbl)
if (nl > 286 || nd > 30)
#endif
return 1; /* bad lengths */
/* read in bit-length-code lengths */
for (j = 0; j < nb; j++) {
NEEDBITS(glbl, 3)
@ -979,7 +999,6 @@ inflate_block(glbl, e)
return inflate_stored(glbl);
if (t == 1)
return inflate_fixed(glbl);
/* bad block type */
return 2;
}
@ -1019,21 +1038,24 @@ xinflate(glbl)
return 0;
}
/* Nobody uses this - why not? */
int
inflate(glbl)
struct inflate *glbl;
{
int i;
#ifdef KERNEL
u_char *p = NULL;
if (!glbl->gz_slide)
p = glbl->gz_slide = malloc(GZ_WSIZE, M_GZIP, M_WAITOK);
#endif
if (!glbl->gz_slide)
#ifdef KERNEL
return(ENOMEM);
#else
return 3; /* kzip expects 3 */
#endif
i = xinflate(glbl);
if (glbl->gz_fixed_td != (struct huft *) NULL) {
@ -1044,11 +1066,12 @@ inflate(glbl)
huft_free(glbl, glbl->gz_fixed_tl);
glbl->gz_fixed_tl = (struct huft *) NULL;
}
#ifdef KERNEL
if (p == glbl->gz_slide) {
free(glbl->gz_slide, M_GZIP);
glbl->gz_slide = NULL;
}
#endif
return i;
}
/* ----------------------- END INFLATE.C */

6
sys/sys/inflate.h
View File

@ -6,13 +6,13 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
* $Id$
* $Id: inflate.h,v 1.4 1994/10/22 11:40:38 phk Exp $
*
*/
#ifndef _SYS_INFLATE_H_
#define _SYS_INFLATE_H_
#ifdef KERNEL
#if defined(KERNEL) || defined(KZIP)
#define GZ_EOF -1
@ -48,6 +48,6 @@ struct inflate {
int inflate __P((struct inflate *));
#endif /* KERNEL */
#endif /* KERNEL || KZIP */
#endif /* ! _SYS_INFLATE_H_ */