Attachment #155637 for bug #199407

Lines 61-67 Link Here

(-)usr.bin/mkulzma/mkulzma.8 (-1 / +1 lines)
61	.Ar cluster_size	61	.Ar cluster_size
62	should be a multiple of 512 bytes.	62	should be a multiple of 512 bytes.
63	.It Fl v	63	.It Fl v
64	Display verbose messages.	64	Display verbose messages. Use multiple times to increase verbosity.
65	.El	65	.El
66	.Sh NOTES	66	.Sh NOTES
67	The compression ratio largely depends on the cluster size used.	67	The compression ratio largely depends on the cluster size used.




			break;

		case 'v':
			verbose++;
			break;

		default:

	}
	hdr.nblocks = sb.st_size / hdr.blksz;
	if ((sb.st_size % hdr.blksz) != 0) {
		if (verbose >= 0)
			fprintf(stderr, "file size is not multiple "
			"of %d, padding data\n", hdr.blksz);
		hdr.nblocks++;

	/* Reserve space for header */
	lseek(fdw, offset, SEEK_SET);

	if (verbose > 0)
		fprintf(stderr, "data size %ju bytes, number of clusters "
		    "%u, index length %zu bytes\n", sb.st_size,
		    hdr.nblocks, iov[1].iov_len);


			lzma_end(&strm);

			if (verbose > 1)
				fprintf(stderr, "cluster #%d, in %u bytes, "
				    "out %u bytes\n", i, hdr.blksz, destlen);
		} else {
			destlen = USED_BLOCKSIZE - (offset % USED_BLOCKSIZE);
			memset(obuf, 0, destlen);
			if (verbose > 0)
				fprintf(stderr, "padding data with %u bytes"
				    " so that file size is multiple of %d\n",
				    destlen,

	}
	close(fdr);

	if (verbose > 0)
		fprintf(stderr, "compressed data to %ju bytes, saved %lld "
		    "bytes, %.2f%% decrease.\n", offset,
		    (long long)(sb.st_size - offset),

Return to bug 199407

Lines 103-109 Link Here

(-)usr.bin/mkulzma/mkulzma.c (-6 / +6 lines)
103	break;	103	break;
104		104
105	case 'v':	105	case 'v':
106	verbose = 1;	106	verbose++;
107	break;	107	break;
108		108
109	default:	109	default:
Lines 163-169 Link Here
163	}	163	}
164	hdr.nblocks = sb.st_size / hdr.blksz;	164	hdr.nblocks = sb.st_size / hdr.blksz;
165	if ((sb.st_size % hdr.blksz) != 0) {	165	if ((sb.st_size % hdr.blksz) != 0) {
166	if (verbose != 0)	166	if (verbose >= 0)
167	fprintf(stderr, "file size is not multiple "	167	fprintf(stderr, "file size is not multiple "
168	"of %d, padding data\n", hdr.blksz);	168	"of %d, padding data\n", hdr.blksz);
169	hdr.nblocks++;	169	hdr.nblocks++;
Lines 190-196 Link Here
190	/* Reserve space for header */	190	/* Reserve space for header */
191	lseek(fdw, offset, SEEK_SET);	191	lseek(fdw, offset, SEEK_SET);
192		192
193	if (verbose != 0)	193	if (verbose > 0)
194	fprintf(stderr, "data size %ju bytes, number of clusters "	194	fprintf(stderr, "data size %ju bytes, number of clusters "
195	"%u, index length %zu bytes\n", sb.st_size,	195	"%u, index length %zu bytes\n", sb.st_size,
196	hdr.nblocks, iov[1].iov_len);	196	hdr.nblocks, iov[1].iov_len);
Lines 239-251 Link Here
239		239
240	lzma_end(&strm);	240	lzma_end(&strm);
241		241
242	if (verbose != 0)	242	if (verbose > 1)
243	fprintf(stderr, "cluster #%d, in %u bytes, "	243	fprintf(stderr, "cluster #%d, in %u bytes, "
244	"out %u bytes\n", i, hdr.blksz, destlen);	244	"out %u bytes\n", i, hdr.blksz, destlen);
245	} else {	245	} else {
246	destlen = USED_BLOCKSIZE - (offset % USED_BLOCKSIZE);	246	destlen = USED_BLOCKSIZE - (offset % USED_BLOCKSIZE);
247	memset(obuf, 0, destlen);	247	memset(obuf, 0, destlen);
248	if (verbose != 0)	248	if (verbose > 0)
249	fprintf(stderr, "padding data with %u bytes"	249	fprintf(stderr, "padding data with %u bytes"
250	" so that file size is multiple of %d\n",	250	" so that file size is multiple of %d\n",
251	destlen,	251	destlen,
Lines 260-266 Link Here
260	}	260	}
261	close(fdr);	261	close(fdr);
262		262
263	if (verbose != 0)	263	if (verbose > 0)
264	fprintf(stderr, "compressed data to %ju bytes, saved %lld "	264	fprintf(stderr, "compressed data to %ju bytes, saved %lld "
265	"bytes, %.2f%% decrease.\n", offset,	265	"bytes, %.2f%% decrease.\n", offset,
266	(long long)(sb.st_size - offset),	266	(long long)(sb.st_size - offset),