Fix a bug that humanize_number() produces "1000" where it should be "1.0G"

or "1.0M".  The bug reported by Greg Troxel.
This commit is contained in:
enami 2007-03-13 02:52:10 +00:00
parent 4b1d78c00e
commit fab1fda977
1 changed files with 8 additions and 3 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: humanize_number.c,v 1.11 2006/06/08 21:08:56 simonb Exp $ */
/* $NetBSD: humanize_number.c,v 1.12 2007/03/13 02:52:10 enami Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@ -39,7 +39,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: humanize_number.c,v 1.11 2006/06/08 21:08:56 simonb Exp $");
__RCSID("$NetBSD: humanize_number.c,v 1.12 2007/03/13 02:52:10 enami Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@ -121,7 +121,12 @@ humanize_number(char *buf, size_t len, int64_t bytes,
for (max = 100, i = len - baselen; i-- > 0;)
max *= 10;
for (i = 0; bytes >= max && i < maxscale; i++)
/*
* Divide the number until it fits the given column.
* If there will be an overflow by the rounding below,
* divide once more.
*/
for (i = 0; bytes >= max - 50 && i < maxscale; i++)
bytes /= divisor;
if (scale & HN_GETSCALE)