op public repos

Blame

Date:: Sat Jun 5 09:28:54 2021 UTC
Message:: simplify deflate checksumming code; fixes errors with upcoming 'gotadmin pack' tweak + ok naddy
Actions:: History | Blob | Raw File
  1 2181e0c8 2019-03-19 stsp /*
  2 2181e0c8 2019-03-19 stsp  * Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org>
  3 2181e0c8 2019-03-19 stsp  *
  4 2181e0c8 2019-03-19 stsp  * Permission to use, copy, modify, and distribute this software for any
  5 2181e0c8 2019-03-19 stsp  * purpose with or without fee is hereby granted, provided that the above
  6 2181e0c8 2019-03-19 stsp  * copyright notice and this permission notice appear in all copies.
  7 2181e0c8 2019-03-19 stsp  *
  8 2181e0c8 2019-03-19 stsp  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  9 2181e0c8 2019-03-19 stsp  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 10 2181e0c8 2019-03-19 stsp  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 11 2181e0c8 2019-03-19 stsp  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 12 2181e0c8 2019-03-19 stsp  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 13 2181e0c8 2019-03-19 stsp  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 14 2181e0c8 2019-03-19 stsp  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 15 2181e0c8 2019-03-19 stsp  */
 16 2181e0c8 2019-03-19 stsp 
 17 2181e0c8 2019-03-19 stsp #include <sys/queue.h>
 18 2181e0c8 2019-03-19 stsp 
 19 2181e0c8 2019-03-19 stsp #include <errno.h>
 20 2181e0c8 2019-03-19 stsp #include <stdio.h>
 21 2181e0c8 2019-03-19 stsp #include <stdlib.h>
 22 2181e0c8 2019-03-19 stsp #include <string.h>
 23 2181e0c8 2019-03-19 stsp #include <sha1.h>
 24 2181e0c8 2019-03-19 stsp #include <zlib.h>
 25 2181e0c8 2019-03-19 stsp #include <time.h>
 26 2181e0c8 2019-03-19 stsp 
 27 2181e0c8 2019-03-19 stsp #include "got_error.h"
 28 2181e0c8 2019-03-19 stsp #include "got_object.h"
 29 324d37e7 2019-05-11 stsp #include "got_path.h"
 30 2181e0c8 2019-03-19 stsp 
 31 2181e0c8 2019-03-19 stsp #include "got_lib_deflate.h"
 32 2181e0c8 2019-03-19 stsp 
 33 2181e0c8 2019-03-19 stsp #ifndef MIN
 34 2181e0c8 2019-03-19 stsp #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
 35 2181e0c8 2019-03-19 stsp #endif
 36 2181e0c8 2019-03-19 stsp 
 37 2181e0c8 2019-03-19 stsp const struct got_error *
 38 3b9e6fcf 2021-06-05 stsp got_deflate_init(struct got_deflate_buf *zb, uint8_t *outbuf, size_t bufsize)
 39 2181e0c8 2019-03-19 stsp {
 40 2181e0c8 2019-03-19 stsp 	const struct got_error *err = NULL;
 41 2181e0c8 2019-03-19 stsp 	int zerr;
 42 2181e0c8 2019-03-19 stsp 
 43 2181e0c8 2019-03-19 stsp 	memset(&zb->z, 0, sizeof(zb->z));
 44 2181e0c8 2019-03-19 stsp 
 45 2181e0c8 2019-03-19 stsp 	zb->z.zalloc = Z_NULL;
 46 2181e0c8 2019-03-19 stsp 	zb->z.zfree = Z_NULL;
 47 2181e0c8 2019-03-19 stsp 	zerr = deflateInit(&zb->z, Z_DEFAULT_COMPRESSION);
 48 2181e0c8 2019-03-19 stsp 	if (zerr != Z_OK) {
 49 2181e0c8 2019-03-19 stsp 		if  (zerr == Z_ERRNO)
 50 638f9024 2019-05-13 stsp 			return got_error_from_errno("deflateInit");
 51 2181e0c8 2019-03-19 stsp 		if  (zerr == Z_MEM_ERROR) {
 52 2181e0c8 2019-03-19 stsp 			errno = ENOMEM;
 53 638f9024 2019-05-13 stsp 			return got_error_from_errno("deflateInit");
 54 2181e0c8 2019-03-19 stsp 		}
 55 2181e0c8 2019-03-19 stsp 		return got_error(GOT_ERR_COMPRESSION);
 56 2181e0c8 2019-03-19 stsp 	}
 57 2181e0c8 2019-03-19 stsp 
 58 2181e0c8 2019-03-19 stsp 	zb->inlen = zb->outlen = bufsize;
 59 2181e0c8 2019-03-19 stsp 
 60 2181e0c8 2019-03-19 stsp 	zb->inbuf = calloc(1, zb->inlen);
 61 2181e0c8 2019-03-19 stsp 	if (zb->inbuf == NULL) {
 62 638f9024 2019-05-13 stsp 		err = got_error_from_errno("calloc");
 63 2181e0c8 2019-03-19 stsp 		goto done;
 64 2181e0c8 2019-03-19 stsp 	}
 65 2181e0c8 2019-03-19 stsp 
 66 2181e0c8 2019-03-19 stsp 	zb->flags = 0;
 67 2181e0c8 2019-03-19 stsp 	if (outbuf == NULL) {
 68 2181e0c8 2019-03-19 stsp 		zb->outbuf = calloc(1, zb->outlen);
 69 2181e0c8 2019-03-19 stsp 		if (zb->outbuf == NULL) {
 70 638f9024 2019-05-13 stsp 			err = got_error_from_errno("calloc");
 71 2181e0c8 2019-03-19 stsp 			goto done;
 72 2181e0c8 2019-03-19 stsp 		}
 73 2181e0c8 2019-03-19 stsp 		zb->flags |= GOT_DEFLATE_F_OWN_OUTBUF;
 74 2181e0c8 2019-03-19 stsp 	} else
 75 2181e0c8 2019-03-19 stsp 		zb->outbuf = outbuf;
 76 2181e0c8 2019-03-19 stsp done:
 77 2181e0c8 2019-03-19 stsp 	if (err)
 78 2181e0c8 2019-03-19 stsp 		got_deflate_end(zb);
 79 2181e0c8 2019-03-19 stsp 	return err;
 80 2181e0c8 2019-03-19 stsp }
 81 2181e0c8 2019-03-19 stsp 
 82 91b40e30 2021-05-21 stsp static void
 83 91b40e30 2021-05-21 stsp csum_output(struct got_deflate_checksum *csum, const char *buf, size_t len)
 84 91b40e30 2021-05-21 stsp {
 85 91b40e30 2021-05-21 stsp 	if (csum->output_crc)
 86 91b40e30 2021-05-21 stsp 		*csum->output_crc = crc32(*csum->output_crc, buf, len);
 87 91b40e30 2021-05-21 stsp 
 88 91b40e30 2021-05-21 stsp 	if (csum->output_sha1)
 89 91b40e30 2021-05-21 stsp 		SHA1Update(csum->output_sha1, buf, len);
 90 91b40e30 2021-05-21 stsp }
 91 91b40e30 2021-05-21 stsp 
 92 2181e0c8 2019-03-19 stsp const struct got_error *
 93 2181e0c8 2019-03-19 stsp got_deflate_read(struct got_deflate_buf *zb, FILE *f, size_t *outlenp)
 94 2181e0c8 2019-03-19 stsp {
 95 2181e0c8 2019-03-19 stsp 	size_t last_total_out = zb->z.total_out;
 96 2181e0c8 2019-03-19 stsp 	z_stream *z = &zb->z;
 97 2181e0c8 2019-03-19 stsp 	int ret = Z_ERRNO;
 98 2181e0c8 2019-03-19 stsp 
 99 2181e0c8 2019-03-19 stsp 	z->next_out = zb->outbuf;
100 2181e0c8 2019-03-19 stsp 	z->avail_out = zb->outlen;
101 2181e0c8 2019-03-19 stsp 
102 2181e0c8 2019-03-19 stsp 	*outlenp = 0;
103 2181e0c8 2019-03-19 stsp 	do {
104 2181e0c8 2019-03-19 stsp 		if (z->avail_in == 0) {
105 2181e0c8 2019-03-19 stsp 			size_t n = fread(zb->inbuf, 1, zb->inlen, f);
106 2181e0c8 2019-03-19 stsp 			if (n == 0) {
107 2181e0c8 2019-03-19 stsp 				if (ferror(f))
108 2181e0c8 2019-03-19 stsp 					return got_ferror(f, GOT_ERR_IO);
109 2181e0c8 2019-03-19 stsp 				/* EOF */
110 4e4a7005 2019-04-13 stsp 				ret = deflate(z, Z_FINISH);
111 2181e0c8 2019-03-19 stsp 				break;
112 2181e0c8 2019-03-19 stsp 			}
113 2181e0c8 2019-03-19 stsp 			z->next_in = zb->inbuf;
114 2181e0c8 2019-03-19 stsp 			z->avail_in = n;
115 2181e0c8 2019-03-19 stsp 		}
116 2181e0c8 2019-03-19 stsp 		ret = deflate(z, Z_NO_FLUSH);
117 2181e0c8 2019-03-19 stsp 	} while (ret == Z_OK && z->avail_out > 0);
118 2181e0c8 2019-03-19 stsp 
119 2181e0c8 2019-03-19 stsp 	if (ret == Z_OK) {
120 2181e0c8 2019-03-19 stsp 		zb->flags |= GOT_DEFLATE_F_HAVE_MORE;
121 2181e0c8 2019-03-19 stsp 	} else {
122 2181e0c8 2019-03-19 stsp 		if (ret != Z_STREAM_END)
123 2181e0c8 2019-03-19 stsp 			return got_error(GOT_ERR_COMPRESSION);
124 2181e0c8 2019-03-19 stsp 		zb->flags &= ~GOT_DEFLATE_F_HAVE_MORE;
125 2181e0c8 2019-03-19 stsp 	}
126 2181e0c8 2019-03-19 stsp 
127 2181e0c8 2019-03-19 stsp 	*outlenp = z->total_out - last_total_out;
128 2181e0c8 2019-03-19 stsp 	return NULL;
129 2181e0c8 2019-03-19 stsp }
130 2181e0c8 2019-03-19 stsp 
131 2181e0c8 2019-03-19 stsp void
132 2181e0c8 2019-03-19 stsp got_deflate_end(struct got_deflate_buf *zb)
133 2181e0c8 2019-03-19 stsp {
134 2181e0c8 2019-03-19 stsp 	free(zb->inbuf);
135 2181e0c8 2019-03-19 stsp 	if (zb->flags & GOT_DEFLATE_F_OWN_OUTBUF)
136 2181e0c8 2019-03-19 stsp 		free(zb->outbuf);
137 2181e0c8 2019-03-19 stsp 	deflateEnd(&zb->z);
138 2181e0c8 2019-03-19 stsp }
139 2181e0c8 2019-03-19 stsp 
140 2181e0c8 2019-03-19 stsp const struct got_error *
141 91b40e30 2021-05-21 stsp got_deflate_to_file(size_t *outlen, FILE *infile, FILE *outfile,
142 91b40e30 2021-05-21 stsp     struct got_deflate_checksum *csum)
143 2181e0c8 2019-03-19 stsp {
144 2181e0c8 2019-03-19 stsp 	const struct got_error *err;
145 2181e0c8 2019-03-19 stsp 	size_t avail;
146 2181e0c8 2019-03-19 stsp 	struct got_deflate_buf zb;
147 2181e0c8 2019-03-19 stsp 
148 3b9e6fcf 2021-06-05 stsp 	err = got_deflate_init(&zb, NULL, GOT_DEFLATE_BUFSIZE);
149 2181e0c8 2019-03-19 stsp 	if (err)
150 2181e0c8 2019-03-19 stsp 		goto done;
151 2181e0c8 2019-03-19 stsp 
152 2181e0c8 2019-03-19 stsp 	*outlen = 0;
153 2181e0c8 2019-03-19 stsp 
154 2181e0c8 2019-03-19 stsp 	do {
155 2181e0c8 2019-03-19 stsp 		err = got_deflate_read(&zb, infile, &avail);
156 2181e0c8 2019-03-19 stsp 		if (err)
157 2181e0c8 2019-03-19 stsp 			goto done;
158 2181e0c8 2019-03-19 stsp 		if (avail > 0) {
159 2181e0c8 2019-03-19 stsp 			size_t n;
160 2181e0c8 2019-03-19 stsp 			n = fwrite(zb.outbuf, avail, 1, outfile);
161 2181e0c8 2019-03-19 stsp 			if (n != 1) {
162 2181e0c8 2019-03-19 stsp 				err = got_ferror(outfile, GOT_ERR_IO);
163 2181e0c8 2019-03-19 stsp 				goto done;
164 2181e0c8 2019-03-19 stsp 			}
165 3b9e6fcf 2021-06-05 stsp 			if (csum)
166 3b9e6fcf 2021-06-05 stsp 				csum_output(csum, zb.outbuf, avail);
167 2181e0c8 2019-03-19 stsp 			*outlen += avail;
168 2181e0c8 2019-03-19 stsp 		}
169 2181e0c8 2019-03-19 stsp 	} while (zb.flags & GOT_DEFLATE_F_HAVE_MORE);
170 2181e0c8 2019-03-19 stsp 
171 2181e0c8 2019-03-19 stsp done:
172 2181e0c8 2019-03-19 stsp 	got_deflate_end(&zb);
173 2181e0c8 2019-03-19 stsp 	return err;
174 2181e0c8 2019-03-19 stsp }