From m.seaman@infracaninophile.co.uk  Sun Sep  9 06:32:36 2012
Return-Path: <m.seaman@infracaninophile.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A96171065673
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Sep 2012 06:32:36 +0000 (UTC)
	(envelope-from m.seaman@infracaninophile.co.uk)
Received: from smtp.infracaninophile.co.uk (smtp6.infracaninophile.co.uk [IPv6:2001:8b0:151:1:3cd3:cd67:fafa:3d78])
	by mx1.freebsd.org (Postfix) with ESMTP id 1A4B08FC17
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Sep 2012 06:32:35 +0000 (UTC)
Received: from lucid-nonsense.infracaninophile.co.uk (localhost [IPv6:::1])
	by smtp.infracaninophile.co.uk (8.14.5/8.14.5) with ESMTP id q896WRIQ011656
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 9 Sep 2012 07:32:27 +0100 (BST)
	(envelope-from matthew@lucid-nonsense.infracaninophile.co.uk)
Received: (from matthew@localhost)
	by lucid-nonsense.infracaninophile.co.uk (8.14.5/8.14.5/Submit) id q896WQ9b011655;
	Sun, 9 Sep 2012 07:32:26 +0100 (BST)
	(envelope-from matthew)
Message-Id: <201209090632.q896WQ9b011655@lucid-nonsense.infracaninophile.co.uk>
Date: Sun, 9 Sep 2012 07:32:26 +0100 (BST)
From: Matthew Seaman <matthew@freebsd.org>
Reply-To: Matthew Seaman <matthew@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: humanize_number(3) fails to show HN_IEC_PREFIXES correctly
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         171487
>Category:       bin
>Synopsis:       [libutil] [patch] humanize_number(3) fails to show HN_IEC_PREFIXES correctly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bapt
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 09 06:40:05 UTC 2012
>Closed-Date:    Wed Sep 19 06:28:52 UTC 2012
>Last-Modified:  Wed Sep 19 06:30:14 UTC 2012
>Originator:     Matthew Seaman
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
Infracaninophile
>Environment:
System: FreeBSD lucid-nonsense.infracaninophile.co.uk 9.0-STABLE FreeBSD 9.0-STABLE #18 r237463: Sat Jun 23 07:14:31 BST 2012 root@lucid-nonsense.infracaninophile.co.uk:/usr/obj/usr/src/sys/LUCID-NONSENSE amd64


	
>Description:

An off-by-one error means that humanize_number(3) can't produce the
IEC / SI binary prefixes (Ki,  Mi, Gi, etc) correctly.

>How-To-Repeat:

worm:/tmp:% cat foo.c
#include <libutil.h>
#include <stdio.h>

int
main (__unused int argc, __unused const char *argv[])
{
	char	buf[12];

	humanize_number(buf, sizeof(buf), 1048576, "", 1, HN_IEC_PREFIXES);
	printf("%s\n", buf);
}
worm:/tmp:% clang -lutil -o foo foo.c
worm:/tmp:% ./foo
1024 i

After applying the patch:

worm:/tmp:% ./foo
1024 Ki

>Fix:

	

--- HN.diff begins here ---
Index: humanize_number.c
===================================================================
--- humanize_number.c	(revision 238771)
+++ humanize_number.c	(working copy)
@@ -76,7 +76,7 @@
 		if (flags & HN_B)
 			prefixes = "B\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
 		else
-			prefixes = "\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
+			prefixes = "\0\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
 	} else {
 		baselen = 1;
 		if (flags & HN_DIVISOR_1000)
--- HN.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: bapt 
State-Changed-When: Wed Sep 12 11:41:17 UTC 2012 
State-Changed-Why:  
awaiting MFC 


Responsible-Changed-From-To: freebsd-bugs->bapt 
Responsible-Changed-By: bapt 
Responsible-Changed-When: Wed Sep 12 11:41:17 UTC 2012 
Responsible-Changed-Why:  
awaiting MFC 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171487 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/171487: commit references a PR
Date: Wed, 12 Sep 2012 11:41:27 +0000 (UTC)

 Author: bapt
 Date: Wed Sep 12 11:41:03 2012
 New Revision: 240391
 URL: http://svn.freebsd.org/changeset/base/240391
 
 Log:
   Fix IEC / SI binary prefixes (Ki, Mi, Gi, etc) production by humanize_number(3)
   
   PR:		bin/171487
   Submitted by:	matthew
   MFC after:	1 week
 
 Modified:
   head/lib/libutil/humanize_number.c
 
 Modified: head/lib/libutil/humanize_number.c
 ==============================================================================
 --- head/lib/libutil/humanize_number.c	Wed Sep 12 10:53:08 2012	(r240390)
 +++ head/lib/libutil/humanize_number.c	Wed Sep 12 11:41:03 2012	(r240391)
 @@ -76,7 +76,7 @@ humanize_number(char *buf, size_t len, i
  		if (flags & HN_B)
  			prefixes = "B\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
  		else
 -			prefixes = "\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
 +			prefixes = "\0\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
  	} else {
  		baselen = 1;
  		if (flags & HN_DIVISOR_1000)
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/171487: commit references a PR
Date: Wed, 19 Sep 2012 06:18:54 +0000 (UTC)

 Author: bapt
 Date: Wed Sep 19 06:18:42 2012
 New Revision: 240687
 URL: http://svn.freebsd.org/changeset/base/240687
 
 Log:
   MFC: r240391
   
   Fix IEC / SI binary prefixes (Ki, Mi, Gi, etc) production by humanize_number(3)
   
   PR:		bin/171487
   Submitted by:	matthew
 
 Modified:
   stable/9/lib/libutil/humanize_number.c
 Directory Properties:
   stable/9/lib/libutil/   (props changed)
 
 Modified: stable/9/lib/libutil/humanize_number.c
 ==============================================================================
 --- stable/9/lib/libutil/humanize_number.c	Wed Sep 19 05:11:25 2012	(r240686)
 +++ stable/9/lib/libutil/humanize_number.c	Wed Sep 19 06:18:42 2012	(r240687)
 @@ -76,7 +76,7 @@ humanize_number(char *buf, size_t len, i
  		if (flags & HN_B)
  			prefixes = "B\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
  		else
 -			prefixes = "\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
 +			prefixes = "\0\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
  	} else {
  		baselen = 1;
  		if (flags & HN_DIVISOR_1000)
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: bapt 
State-Changed-When: Wed Sep 19 06:28:51 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171487 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/171487: commit references a PR
Date: Wed, 19 Sep 2012 06:20:40 +0000 (UTC)

 Author: bapt
 Date: Wed Sep 19 06:20:25 2012
 New Revision: 240688
 URL: http://svn.freebsd.org/changeset/base/240688
 
 Log:
   MFC: r240391
   
   Fix IEC / SI binary prefixes (Ki, Mi, Gi, etc) production by humanize_number(3)
   
   PR:		bin/171487
   Submitted by:	matthew
 
 Modified:
   stable/8/lib/libutil/humanize_number.c
 Directory Properties:
   stable/8/lib/libutil/   (props changed)
 
 Modified: stable/8/lib/libutil/humanize_number.c
 ==============================================================================
 --- stable/8/lib/libutil/humanize_number.c	Wed Sep 19 06:18:42 2012	(r240687)
 +++ stable/8/lib/libutil/humanize_number.c	Wed Sep 19 06:20:25 2012	(r240688)
 @@ -76,7 +76,7 @@ humanize_number(char *buf, size_t len, i
  		if (flags & HN_B)
  			prefixes = "B\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
  		else
 -			prefixes = "\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
 +			prefixes = "\0\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
  	} else {
  		baselen = 1;
  		if (flags & HN_DIVISOR_1000)
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
