Attachment 155637 Details for Bug 199407 – add a mkulzma(8) patch

[patch] add a mkulzma(8) patch

mkulzma.diff (text/plain), 1.91 KB, created by Keith White on 2015-04-16 01:44:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Keith White

Created: 2015-04-16 01:44:48 UTC

Size: 1.91 KB

patch

obsolete

>Index: usr.bin/mkulzma/mkulzma.8
>===================================================================
>--- usr.bin/mkulzma/mkulzma.8	(revision 281308)
>+++ usr.bin/mkulzma/mkulzma.8	(working copy)
>@@ -61,7 +61,7 @@
> .Ar cluster_size
> should be a multiple of 512 bytes.
> .It Fl v
>-Display verbose messages.
>+Display verbose messages.  Use multiple times to increase verbosity.
> .El
> .Sh NOTES
> The compression ratio largely depends on the cluster size used.
>Index: usr.bin/mkulzma/mkulzma.c
>===================================================================
>--- usr.bin/mkulzma/mkulzma.c	(revision 281308)
>+++ usr.bin/mkulzma/mkulzma.c	(working copy)
>@@ -103,7 +103,7 @@
> 			break;
> 
> 		case 'v':
>-			verbose = 1;
>+			verbose++;
> 			break;
> 
> 		default:
>@@ -163,7 +163,7 @@
> 	}
> 	hdr.nblocks = sb.st_size / hdr.blksz;
> 	if ((sb.st_size % hdr.blksz) != 0) {
>-		if (verbose != 0)
>+		if (verbose >= 0)
> 			fprintf(stderr, "file size is not multiple "
> 			"of %d, padding data\n", hdr.blksz);
> 		hdr.nblocks++;
>@@ -190,7 +190,7 @@
> 	/* Reserve space for header */
> 	lseek(fdw, offset, SEEK_SET);
> 
>-	if (verbose != 0)
>+	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);
>@@ -239,13 +239,13 @@
> 
> 			lzma_end(&strm);
> 
>-			if (verbose != 0)
>+			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)
>+			if (verbose > 0)
> 				fprintf(stderr, "padding data with %u bytes"
> 				    " so that file size is multiple of %d\n",
> 				    destlen,
>@@ -260,7 +260,7 @@
> 	}
> 	close(fdr);
> 
>-	if (verbose != 0)
>+	if (verbose > 0)
> 		fprintf(stderr, "compressed data to %ju bytes, saved %lld "
> 		    "bytes, %.2f%% decrease.\n", offset,
> 		    (long long)(sb.st_size - offset),

Actions: View | Diff

Attachments on bug 199407: 155531 | 155637