[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Bug-gnulib] human.c merge from coreutils
|
From: |
Paul Eggert |
|
Subject: |
Re: [Bug-gnulib] human.c merge from coreutils |
|
Date: |
09 Jun 2003 13:04:21 -0700 |
|
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 |
James Youngman <address@hidden> writes:
> On Wed, Jun 04, 2003 at 09:36:38PM -0700, Paul Eggert wrote:
> > The coreutils version of human.c etc. had diverged a bit from gnulib.
> > I merged the two, and installed the following patch into gnulib.
> > There are some incompatible interface changes here, but since the
> > only customers of these files (as far as I know) are coreutils and
> > tar, we should be OK.
>
> IIRC, findutils also uses it.
Thanks; I'd forgotten that. Here's a patch to findutils 4.1.20 to
accommodate all the changes to human.c. I didn't quite grok how
findutils/gnulib/lib/Makefile.am works (perhaps this has something to
do with the change to findutils/Makefile.am below?) so I left that
alone, but presumably stdbool.m4 and stdbool_.h need to be added to it
somewhere. If someone can explain to me how
findutils/gnulib/lib/Makefile.am works I can fix that part too.
2003-06-09 Paul Eggert <address@hidden>
Upgrade to current version of gnulib human.c; this adds support
for block sizes greater than 2GiB, among other things. It uses
stdbool.h, so we need to update to the latest version of that too.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I $(top_srcdir)/gnulib/m4.
* configure.in (AM_STDBOOL_H): Add.
* find/defs.h (true, false): Remove.
(boolean): Define to bool, not int. All uses of 'boolean' should
probably be changed to 'bool', and this definition removed, but
I omitted that to keep the change smaller.
* find/defs.h (list_file): Now takes int human_output_opts and
uintmax_t output_block_size rather than int output_block_size.
* lib/listfile.c (list_file): Likewise.
* find/defs.h (output_block_size): Remove. All uses changed to:
(human_output_opts, output_block_size): New decls.
* find/find.c: Likewise.
* find/find.c (main, pred_fls, pred_fprintf, pred_ls, format_date):
Adjust to new signatures for human functions.
* lib/list.file (list_file): Likewise.
* gnulib/lib/human.c, gnulib/lib/human.h, gnulib/m4/human.m4:
Update to current gnulib version.
* gnulib/lib/stdbool_.h, gnulib/m4/stdbool.m4: New files, from gnulib.
diff -Naurp findutils-4.1.20/Makefile.am findutils-4.1.20-human/Makefile.am
--- findutils-4.1.20/Makefile.am Sat May 24 09:56:54 2003
+++ findutils-4.1.20-human/Makefile.am Mon Jun 9 12:41:34 2003
@@ -4,6 +4,6 @@ EXTRA_DIST = COPYING ChangeLog TODO inst
THANKS
SUBDIRS = gnulib lib intl find xargs locate doc po
-#ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I $(top_srcdir)/gnulib/m4
DISTCLEANFILES = intl/libintl.h
diff -Naurp findutils-4.1.20/configure.in findutils-4.1.20-human/configure.in
--- findutils-4.1.20/configure.in Mon May 26 11:16:09 2003
+++ findutils-4.1.20-human/configure.in Mon Jun 9 12:37:16 2003
@@ -37,6 +37,7 @@ AC_CHECK_LIB(sun, getpwnam)
dnl Checks for header files.
AC_HEADER_STDC
+AM_STDBOOL_H
AC_CHECK_HEADERS(fcntl.h string.h limits.h unistd.h errno.h stdlib.h stddef.h)
AC_CHECK_HEADERS(unistd.h inttypes.h fcntl.h locale.h)
AC_CHECK_HEADERS(sys/param.h)
diff -Naurp findutils-4.1.20/find/defs.h findutils-4.1.20-human/find/defs.h
--- findutils-4.1.20/find/defs.h Mon May 26 06:37:29 2003
+++ findutils-4.1.20-human/find/defs.h Mon Jun 9 12:36:30 2003
@@ -127,10 +127,11 @@ int stat PARAMS((const char *__path, str
#define MODE_RWX (S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW)
#define MODE_ALL (S_ISUID | S_ISGID | S_ISVTX | MODE_RWX)
-/* Not char because of type promotion; NeXT gcc can't handle it. */
-typedef int boolean;
-#define true 1
-#define false 0
+#include <stdbool.h>
+
+/* FIXME: Replace all instances of 'boolean' with 'bool' and remove
+ the following line. */
+typedef bool boolean;
/* Pointer to function returning boolean. */
typedef boolean (*PFB)();
@@ -298,7 +299,7 @@ char *dirname PARAMS((char *path));
void error PARAMS((int status, int errnum, char *message, ...));
/* listfile.c */
-void list_file PARAMS((char *name, char *relname, struct stat *statp, time_t
current_time, int output_block_size, FILE *stream));
+void list_file PARAMS((char *name, char *relname, struct stat *statp, time_t
current_time, int human_output_opts, uintmax_t output_block_size, FILE
*stream));
char *get_link_name PARAMS((char *name, char *relname));
/* stpcpy.c */
@@ -408,7 +409,8 @@ extern boolean do_dir_first;
extern int maxdepth;
extern int mindepth;
extern int curdepth;
-extern int output_block_size;
+extern int human_output_opts;
+extern uintmax_t output_block_size;
extern time_t start_time;
extern time_t cur_day_start;
extern boolean full_days;
diff -Naurp findutils-4.1.20/find/find.c findutils-4.1.20-human/find/find.c
--- findutils-4.1.20/find/find.c Sat May 24 11:36:25 2003
+++ findutils-4.1.20-human/find/find.c Mon Jun 9 12:32:03 2003
@@ -85,8 +85,11 @@ int mindepth;
/* Current depth; 0 means current path is a command line arg. */
int curdepth;
+/* Output block size options. */
+int human_output_opts;
+
/* Output block size. */
-int output_block_size;
+uintmax_t output_block_size;
/* Time at start of execution. */
time_t start_time;
@@ -184,7 +187,8 @@ main (int argc, char **argv)
xstat = lstat;
#endif /* !DEBUG_STAT */
- human_block_size (getenv ("FIND_BLOCK_SIZE"), 0, &output_block_size);
+ human_output_opts = human_options (getenv ("FIND_BLOCK_SIZE"), false,
+ &output_block_size);
#ifdef DEBUG
printf ("cur_day_start = %s", ctime (&cur_day_start));
diff -Naurp findutils-4.1.20/find/pred.c findutils-4.1.20-human/find/pred.c
--- findutils-4.1.20/find/pred.c Sat May 24 11:36:25 2003
+++ findutils-4.1.20-human/find/pred.c Mon Jun 9 12:30:45 2003
@@ -491,7 +491,7 @@ boolean
pred_fls (char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)
{
list_file (pathname, rel_pathname, stat_buf, start_time,
- output_block_size, pred_ptr->args.stream);
+ human_output_opts, output_block_size, pred_ptr->args.stream);
return (true);
}
@@ -560,7 +560,7 @@ pred_fprintf (char *pathname, struct sta
case 'b': /* size in 512-byte blocks */
fprintf (fp, segment->text,
human_readable ((uintmax_t) ST_NBLOCKS (*stat_buf),
- hbuf, ST_NBLOCKSIZE, 512));
+ hbuf, 0, ST_NBLOCKSIZE, 512));
break;
case 'c': /* ctime in `ctime' format */
fprintf (fp, segment->text, ctime_format (stat_buf->st_ctime));
@@ -590,7 +590,8 @@ pred_fprintf (char *pathname, struct sta
}
case 'G': /* GID number */
fprintf (fp, segment->text,
- human_readable ((uintmax_t) stat_buf->st_gid, hbuf, 1, 1));
+ human_readable ((uintmax_t) stat_buf->st_gid, hbuf,
+ 0, 1, 1));
break;
case 'h': /* leading directories part of path */
{
@@ -616,12 +617,13 @@ pred_fprintf (char *pathname, struct sta
}
case 'i': /* inode number */
fprintf (fp, segment->text,
- human_readable ((uintmax_t) stat_buf->st_ino, hbuf, 1, 1));
+ human_readable ((uintmax_t) stat_buf->st_ino, hbuf,
+ 0, 1, 1));
break;
case 'k': /* size in 1K blocks */
fprintf (fp, segment->text,
human_readable ((uintmax_t) ST_NBLOCKS (*stat_buf),
- hbuf, ST_NBLOCKSIZE, 1024));
+ hbuf, 0, ST_NBLOCKSIZE, 1024));
break;
case 'l': /* object of symlink */
#ifdef S_ISLNK
@@ -676,7 +678,7 @@ pred_fprintf (char *pathname, struct sta
case 'n': /* number of links */
fprintf (fp, segment->text,
human_readable ((uintmax_t) stat_buf->st_nlink,
- hbuf, 1, 1));
+ hbuf, 0, 1, 1));
break;
case 'p': /* pathname */
fprintf (fp, segment->text, pathname);
@@ -699,7 +701,7 @@ pred_fprintf (char *pathname, struct sta
case 's': /* size in bytes */
fprintf (fp, segment->text,
human_readable ((uintmax_t) stat_buf->st_size,
- hbuf, 1, 1));
+ hbuf, 0, 1, 1));
break;
case 't': /* mtime in `ctime' format */
fprintf (fp, segment->text, ctime_format (stat_buf->st_mtime));
@@ -719,7 +721,8 @@ pred_fprintf (char *pathname, struct sta
}
case 'U': /* UID number */
fprintf (fp, segment->text,
- human_readable ((uintmax_t) stat_buf->st_uid, hbuf, 1, 1));
+ human_readable ((uintmax_t) stat_buf->st_uid, hbuf,
+ 0, 1, 1));
break;
}
}
@@ -862,7 +865,7 @@ boolean
pred_ls (char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)
{
list_file (pathname, rel_pathname, stat_buf, start_time,
- output_block_size, stdout);
+ human_output_opts, output_block_size, stdout);
return (true);
}
@@ -1319,7 +1322,7 @@ format_date (time_t when, int kind)
else
{
uintmax_t w = when;
- char *p = human_readable (when < 0 ? -w : w, buf + 1, 1, 1);
+ char *p = human_readable (when < 0 ? -w : w, buf + 1, 0, 1, 1);
if (when < 0)
*--p = '-';
return p;
diff -Naurp findutils-4.1.20/gnulib/lib/human.c
findutils-4.1.20-human/gnulib/lib/human.c
--- findutils-4.1.20/gnulib/lib/human.c Tue Nov 5 13:45:29 2002
+++ findutils-4.1.20-human/gnulib/lib/human.c Thu Jun 5 01:34:42 2003
@@ -1,7 +1,7 @@
/* human.c -- print human readable file size
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software
- Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free
+ Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,34 +17,28 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* Originally contributed by address@hidden;
- --si, output block size selection, and large file support
- added by address@hidden */
+/* Written by Paul Eggert and Larry McVoy. */
#if HAVE_CONFIG_H
# include <config.h>
#endif
-#include <sys/types.h>
-#include <stdio.h>
+#include "human.h"
-#if HAVE_LIMITS_H
-# include <limits.h>
+#ifndef SIZE_MAX
+# define SIZE_MAX ((size_t) -1)
#endif
-
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
+#ifndef UINTMAX_MAX
+# define UINTMAX_MAX ((uintmax_t) -1)
#endif
-#ifndef CHAR_BIT
-# define CHAR_BIT 8
+#if HAVE_LOCALE_H && HAVE_LOCALECONV
+# include <locale.h>
#endif
+
#if HAVE_STDLIB_H
# include <stdlib.h>
#endif
-
#ifndef HAVE_DECL_GETENV
"this configure-time declaration test was not run"
#endif
@@ -52,6 +46,14 @@
char *getenv ();
#endif
+#if HAVE_STRING_H
+# include <string.h>
+#endif
+
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -59,9 +61,10 @@ char *getenv ();
#include <error.h>
#include <xstrtol.h>
-#include "human.h"
+/* The maximum length of a suffix like "KiB". */
+#define HUMAN_READABLE_SUFFIX_LENGTH_MAX 3
-static const char suffixes[] =
+static const char power_letter[] =
{
0, /* not used */
'K', /* kibi ('k' for kilo is a special case) */
@@ -74,33 +77,18 @@ static const char suffixes[] =
'Y' /* yotta or 2**80 */
};
-/* Generate into P[-1] (and possibly P[-2]) the proper suffix for
- POWER and BASE. Return the address of the generated suffix. */
-static char *
-generate_suffix_backwards (char *p, int power, int base)
-{
- char letter = suffixes[power];
- if (base == 1000)
- {
- *--p = 'B';
- if (power == 1)
- letter = 'k';
- }
-
- *--p = letter;
- return p;
-}
-
-/* If INEXACT_STYLE is not human_round_to_even, and if easily
+/* If INEXACT_STYLE is not human_round_to_nearest, and if easily
possible, adjust VALUE according to the style. */
-static double
-adjust_value (enum human_inexact_style inexact_style, double value)
+
+static long double
+adjust_value (int inexact_style, long double value)
{
- /* Do not use the floor or ceil functions, as that would mean
- linking with the standard math library, which is a porting pain.
- So leave the value alone if it is too large to easily round. */
- if (inexact_style != human_round_to_even && value < (uintmax_t) -1)
+ /* Do not use the floorl or ceill functions, as that would mean
+ checking for their presence and possibly linking with the
+ standard math library, which is a porting pain. So leave the
+ value alone if it is too large to easily round. */
+ if (inexact_style != human_round_to_nearest && value < UINTMAX_MAX)
{
uintmax_t u = value;
value = u + (inexact_style == human_ceiling && u != value);
@@ -109,199 +97,323 @@ adjust_value (enum human_inexact_style i
return value;
}
-/* Like human_readable_inexact, except always round to even. */
-char *
-human_readable (uintmax_t n, char *buf,
- int from_block_size, int output_block_size)
+/* Group the digits of NUMBER according to the grouping rules of the
+ current locale. NUMBER contains NUMBERLEN digits. Modify the
+ bytes pointed to by NUMBER in place, subtracting 1 from NUMBER for
+ each byte inserted. Return the starting address of the modified
+ number.
+
+ To group the digits, use GROUPING and THOUSANDS_SEP as in `struct
+ lconv' from <locale.h>. */
+
+static char *
+group_number (char *number, size_t numberlen,
+ char const *grouping, char const *thousands_sep)
{
- return human_readable_inexact (n, buf, from_block_size, output_block_size,
- human_round_to_even);
+ register char *d;
+ size_t grouplen = SIZE_MAX;
+ size_t thousands_seplen = strlen (thousands_sep);
+ size_t i = numberlen;
+
+ /* The maximum possible value for NUMBERLEN is the number of digits
+ in the square of the largest uintmax_t, so double the size of
+ uintmax_t before converting to a bound. 302 / 1000 is ceil
+ (log10 (2.0)). Add 1 for integer division truncation. */
+ char buf[2 * sizeof (uintmax_t) * CHAR_BIT * 302 / 1000 + 1];
+
+ memcpy (buf, number, numberlen);
+ d = number + numberlen;
+
+ for (;;)
+ {
+ unsigned char g = *grouping;
+
+ if (g)
+ {
+ grouplen = g < CHAR_MAX ? g : i;
+ grouping++;
+ }
+
+ if (i < grouplen)
+ grouplen = i;
+
+ d -= grouplen;
+ i -= grouplen;
+ memcpy (d, buf + i, grouplen);
+ if (i == 0)
+ return d;
+
+ d -= thousands_seplen;
+ memcpy (d, thousands_sep, thousands_seplen);
+ }
}
-/* Convert N to a human readable format in BUF.
+/* Convert N to a human readable format in BUF, using the options OPTS.
N is expressed in units of FROM_BLOCK_SIZE. FROM_BLOCK_SIZE must
be nonnegative.
- OUTPUT_BLOCK_SIZE must be nonzero. If it is positive, use units of
- OUTPUT_BLOCK_SIZE in the output number.
-
- Use INEXACT_STYLE to determine whether to take the ceiling or floor
- of any result that cannot be expressed exactly.
+ Use units of TO_BLOCK_SIZE in the output number. TO_BLOCK_SIZE
+ must be positive.
- If OUTPUT_BLOCK_SIZE is negative, use a format like "127K" if
- possible, using powers of -OUTPUT_BLOCK_SIZE; otherwise, use
- ordinary decimal format. Normally -OUTPUT_BLOCK_SIZE is either
- 1000 or 1024; it must be at least 2. Most people visually process
- strings of 3-4 digits effectively, but longer strings of digits are
- more prone to misinterpretation. Hence, converting to an
- abbreviated form usually improves readability. Use a suffix
- indicating which power is being used. For example, assuming
- -OUTPUT_BLOCK_SIZE is 1024, 8500 would be converted to 8.3K,
- 133456345 to 127M, 56990456345 to 53G, and so on. Numbers smaller
- than -OUTPUT_BLOCK_SIZE aren't modified. If -OUTPUT_BLOCK_SIZE is
- 1024, append a "B" after any size letter. */
+ Use (OPTS & (human_round_to_nearest | human_floor | human_ceiling))
+ to determine whether to take the ceiling or floor of any result
+ that cannot be expressed exactly.
+
+ If (OPTS & human_group_digits), group the thousands digits
+ according to the locale, e.g., `1,000,000' in an American English
+ locale.
+
+ If (OPTS & human_autoscale), deduce the output block size
+ automatically; TO_BLOCK_SIZE must be 1 but it has no effect on the
+ output. Use powers of 1024 if (OPTS & human_base_1024), and powers
+ of 1000 otherwise. For example, assuming powers of 1024, 8500
+ would be converted to 8.3, 133456345 to 127, 56990456345 to 53, and
+ so on. Numbers smaller than the power aren't modified.
+ human_autoscale is normally used together with human_SI.
+
+ If (OPTS & human_SI), append an SI prefix indicating which power is
+ being used. If in addition (OPTS & human_B), append "B" (if base
+ 1000) or "iB" (if base 1024) to the SI prefix. When ((OPTS &
+ human_SI) && ! (OPTS & human_autoscale)), TO_BLOCK_SIZE must be a
+ power of 1024 or of 1000, depending on (OPTS &
+ human_base_1024). */
char *
-human_readable_inexact (uintmax_t n, char *buf,
- int from_block_size, int output_block_size,
- enum human_inexact_style inexact_style)
+human_readable (uintmax_t n, char *buf, int opts,
+ uintmax_t from_block_size, uintmax_t to_block_size)
{
+ int inexact_style =
+ opts & (human_round_to_nearest | human_floor | human_ceiling);
+ unsigned int base = opts & human_base_1024 ? 1024 : 1000;
uintmax_t amt;
- int base;
- int to_block_size;
- int tenths = 0;
- int power;
+ int tenths;
+ int exponent = -1;
+ int exponent_max = sizeof power_letter - 1;
char *p;
+ char *psuffix;
+ char const *integerlim;
/* 0 means adjusted N == AMT.TENTHS;
1 means AMT.TENTHS < adjusted N < AMT.TENTHS + 0.05;
2 means adjusted N == AMT.TENTHS + 0.05;
3 means AMT.TENTHS + 0.05 < adjusted N < AMT.TENTHS + 0.1. */
- int rounding = 0;
+ int rounding;
- if (output_block_size < 0)
+ char const *decimal_point = ".";
+ size_t decimal_pointlen = 1;
+ char const *grouping = "";
+ char const *thousands_sep = "";
+#if HAVE_LOCALE_H && HAVE_LOCALECONV
+ struct lconv const *l = localeconv ();
+ size_t pointlen = strlen (l->decimal_point);
+ if (0 < pointlen && pointlen <= MB_LEN_MAX)
{
- base = -output_block_size;
- to_block_size = 1;
+ decimal_point = l->decimal_point;
+ decimal_pointlen = pointlen;
}
- else
+ grouping = l->grouping;
+ if (strlen (l->thousands_sep) <= MB_LEN_MAX)
+ thousands_sep = l->thousands_sep;
+#endif
+
+ psuffix = buf + LONGEST_HUMAN_READABLE - HUMAN_READABLE_SUFFIX_LENGTH_MAX;
+ p = psuffix;
+
+ /* Adjust AMT out of FROM_BLOCK_SIZE units and into TO_BLOCK_SIZE
+ units. If this can be done exactly with integer arithmetic, do
+ not use floating point operations. */
+ if (to_block_size <= from_block_size)
{
- base = 0;
- to_block_size = output_block_size;
+ if (from_block_size % to_block_size == 0)
+ {
+ uintmax_t multiplier = from_block_size / to_block_size;
+ amt = n * multiplier;
+ if (amt / multiplier == n)
+ {
+ tenths = 0;
+ rounding = 0;
+ goto use_integer_arithmetic;
+ }
+ }
+ }
+ else if (from_block_size != 0 && to_block_size % from_block_size == 0)
+ {
+ uintmax_t divisor = to_block_size / from_block_size;
+ uintmax_t r10 = (n % divisor) * 10;
+ uintmax_t r2 = (r10 % divisor) * 2;
+ amt = n / divisor;
+ tenths = r10 / divisor;
+ rounding = r2 < divisor ? 0 < r2 : 2 + (divisor < r2);
+ goto use_integer_arithmetic;
}
- p = buf + LONGEST_HUMAN_READABLE;
- *p = '\0';
+ {
+ /* Either the result cannot be computed easily using uintmax_t,
+ or from_block_size is zero. Fall back on floating point.
+ FIXME: This can yield answers that are slightly off. */
+
+ long double dto_block_size = to_block_size;
+ long double damt = n * (from_block_size / dto_block_size);
+ size_t buflen;
+ size_t nonintegerlen;
-#ifdef lint
- /* Suppress `used before initialized' warning. */
- power = 0;
-#endif
+ if (! (opts & human_autoscale))
+ {
+ sprintf (buf, "%.0Lf", adjust_value (inexact_style, damt));
+ buflen = strlen (buf);
+ nonintegerlen = 0;
+ }
+ else
+ {
+ long double e = 1;
+ exponent = 0;
- /* Adjust AMT out of FROM_BLOCK_SIZE units and into TO_BLOCK_SIZE units. */
+ do
+ {
+ e *= base;
+ exponent++;
+ }
+ while (e * base <= damt && exponent < exponent_max);
+ damt /= e;
+
+ sprintf (buf, "%.1Lf", adjust_value (inexact_style, damt));
+ buflen = strlen (buf);
+ nonintegerlen = decimal_pointlen + 1;
+
+ if (1 + nonintegerlen + ! (opts & human_base_1024) < buflen
+ || ((opts & human_suppress_point_zero)
+ && buf[buflen - 1] == '0'))
+ {
+ sprintf (buf, "%.0Lf",
+ adjust_value (inexact_style, damt * 10) / 10);
+ buflen = strlen (buf);
+ nonintegerlen = 0;
+ }
+ }
+
+ p = psuffix - buflen;
+ memmove (p, buf, buflen);
+ integerlim = p + buflen - nonintegerlen;
+ }
+ goto do_grouping;
+
+ use_integer_arithmetic:
{
- int multiplier;
- int divisor;
- int r2;
- int r10;
- if (to_block_size <= from_block_size
- ? (from_block_size % to_block_size != 0
- || (multiplier = from_block_size / to_block_size,
- (amt = n * multiplier) / multiplier != n))
- : (from_block_size == 0
- || to_block_size % from_block_size != 0
- || (divisor = to_block_size / from_block_size,
- r10 = (n % divisor) * 10,
- r2 = (r10 % divisor) * 2,
- amt = n / divisor,
- tenths = r10 / divisor,
- rounding = r2 < divisor ? 0 < r2 : 2 + (divisor < r2),
- 0)))
+ /* The computation can be done exactly, with integer arithmetic.
+
+ Use power of BASE notation if requested and if adjusted AMT is
+ large enough. */
+
+ if (opts & human_autoscale)
{
- /* Either the result cannot be computed easily using uintmax_t,
- or from_block_size is zero. Fall back on floating point.
- FIXME: This can yield answers that are slightly off. */
-
- double damt = n * (from_block_size / (double) to_block_size);
-
- if (! base)
- sprintf (buf, "%.0f", adjust_value (inexact_style, damt));
- else
- {
- char suffix[3];
- char const *psuffix;
- double e = 1;
- power = 0;
+ exponent = 0;
+ if (base <= amt)
+ {
do
{
- e *= base;
- power++;
+ unsigned r10 = (amt % base) * 10 + tenths;
+ unsigned r2 = (r10 % base) * 2 + (rounding >> 1);
+ amt /= base;
+ tenths = r10 / base;
+ rounding = (r2 < base
+ ? (r2 + rounding) != 0
+ : 2 + (base < r2 + rounding));
+ exponent++;
}
- while (e * base <= damt && power < sizeof suffixes - 1);
+ while (base <= amt && exponent < exponent_max);
- damt /= e;
+ if (amt < 10)
+ {
+ if (inexact_style == human_round_to_nearest
+ ? 2 < rounding + (tenths & 1)
+ : inexact_style == human_ceiling && 0 < rounding)
+ {
+ tenths++;
+ rounding = 0;
+
+ if (tenths == 10)
+ {
+ amt++;
+ tenths = 0;
+ }
+ }
+
+ if (amt < 10
+ && (tenths || ! (opts & human_suppress_point_zero)))
+ {
+ *--p = '0' + tenths;
+ p -= decimal_pointlen;
+ memcpy (p, decimal_point, decimal_pointlen);
+ tenths = rounding = 0;
+ }
+ }
+ }
+ }
- suffix[2] = '\0';
- psuffix = generate_suffix_backwards (suffix + 2, power, base);
- sprintf (buf, "%.1f%s",
- adjust_value (inexact_style, damt), psuffix);
- if (4 + (base == 1000) < strlen (buf))
- sprintf (buf, "%.0f%s",
- adjust_value (inexact_style, damt * 10) / 10, psuffix);
+ if (inexact_style == human_ceiling
+ ? 0 < tenths + rounding
+ : inexact_style == human_round_to_nearest
+ ? 5 < tenths + (2 < rounding + (amt & 1))
+ : /* inexact_style == human_floor */ 0)
+ {
+ amt++;
+
+ if ((opts & human_autoscale)
+ && amt == base && exponent < exponent_max)
+ {
+ exponent++;
+ if (! (opts & human_suppress_point_zero))
+ {
+ *--p = '0';
+ p -= decimal_pointlen;
+ memcpy (p, decimal_point, decimal_pointlen);
+ }
+ amt = 1;
}
+ }
- return buf;
+ integerlim = p;
+
+ do
+ {
+ int digit = amt % 10;
+ *--p = digit + '0';
}
+ while ((amt /= 10) != 0);
}
- /* Use power of BASE notation if adjusted AMT is large enough. */
+ do_grouping:
+ if (opts & human_group_digits)
+ p = group_number (p, integerlim - p, grouping, thousands_sep);
- if (base && base <= amt)
+ if (opts & human_SI)
{
- power = 0;
-
- do
- {
- int r10 = (amt % base) * 10 + tenths;
- int r2 = (r10 % base) * 2 + (rounding >> 1);
- amt /= base;
- tenths = r10 / base;
- rounding = (r2 < base
- ? 0 < r2 + rounding
- : 2 + (base < r2 + rounding));
- power++;
- }
- while (base <= amt && power < sizeof suffixes - 1);
-
- p = generate_suffix_backwards (p, power, base);
-
- if (amt < 10)
+ if (exponent < 0)
{
- if (2 * (1 - (int) inexact_style)
- < rounding + (tenths & (inexact_style == human_round_to_even)))
- {
- tenths++;
- rounding = 0;
-
- if (tenths == 10)
- {
- amt++;
- tenths = 0;
- }
- }
-
- if (amt < 10)
- {
- *--p = '0' + tenths;
- *--p = '.';
- tenths = rounding = 0;
- }
+ uintmax_t power;
+ exponent = 0;
+ for (power = 1; power < to_block_size; power *= base)
+ if (++exponent == exponent_max)
+ break;
}
- }
- if (inexact_style == human_ceiling
- ? 0 < tenths + rounding
- : inexact_style == human_round_to_even
- ? 5 < tenths + (2 < rounding + (amt & 1))
- : /* inexact_style == human_floor */ 0)
- {
- amt++;
+ if (exponent)
+ *psuffix++ = (! (opts & human_base_1024) && exponent == 1
+ ? 'k'
+ : power_letter[exponent]);
- if (amt == base && power < sizeof suffixes - 1)
+ if (opts & human_B)
{
- *p = suffixes[power + 1];
- *--p = '0';
- *--p = '.';
- amt = 1;
+ if ((opts & human_base_1024) && exponent)
+ *psuffix++ = 'i';
+ *psuffix++ = 'B';
}
}
- do
- *--p = '0' + (int) (amt % 10);
- while ((amt /= 10) != 0);
+ *psuffix = '\0';
return p;
}
@@ -314,44 +426,70 @@ human_readable_inexact (uintmax_t n, cha
#endif
static char const *const block_size_args[] = { "human-readable", "si", 0 };
-static int const block_size_types[] = { -1024, -1000 };
+static int const block_size_opts[] =
+ {
+ human_autoscale + human_SI + human_base_1024,
+ human_autoscale + human_SI
+ };
-static int
+static uintmax_t
default_block_size (void)
{
return getenv ("POSIXLY_CORRECT") ? 512 : DEFAULT_BLOCK_SIZE;
}
static strtol_error
-humblock (char const *spec, int *block_size)
+humblock (char const *spec, uintmax_t *block_size, int *options)
{
int i;
+ int opts = 0;
if (! spec && ! (spec = getenv ("BLOCK_SIZE")))
*block_size = default_block_size ();
- else if (0 <= (i = ARGMATCH (spec, block_size_args, block_size_types)))
- *block_size = block_size_types[i];
else
{
- char *ptr;
- unsigned long val;
- strtol_error e = xstrtoul (spec, &ptr, 0, &val, "eEgGkKmMpPtTyYzZ0");
- if (e != LONGINT_OK)
- return e;
- if (*ptr)
- return LONGINT_INVALID_SUFFIX_CHAR;
- if ((int) val < 0 || val != (int) val)
- return LONGINT_OVERFLOW;
- *block_size = (int) val;
+ if (*spec == '\'')
+ {
+ opts |= human_group_digits;
+ spec++;
+ }
+
+ if (0 <= (i = ARGMATCH (spec, block_size_args, block_size_opts)))
+ {
+ opts |= block_size_opts[i];
+ *block_size = 1;
+ }
+ else
+ {
+ char *ptr;
+ strtol_error e = xstrtoumax (spec, &ptr, 0, block_size,
+ "eEgGkKmMpPtTyYzZ0");
+ if (e != LONGINT_OK)
+ return e;
+ if (*ptr)
+ return LONGINT_INVALID_SUFFIX_CHAR;
+ for (; ! ('0' <= *spec && *spec <= '9'); spec++)
+ if (spec == ptr)
+ {
+ opts |= human_SI;
+ if (ptr[-1] == 'B')
+ opts |= human_B;
+ if (ptr[-1] != 'B' || ptr[-2] == 'i')
+ opts |= human_base_1024;
+ break;
+ }
+ }
}
+ *options = opts;
return LONGINT_OK;
}
-void
-human_block_size (char const *spec, int report_errors, int *block_size)
+int
+human_options (char const *spec, bool report_errors, uintmax_t *block_size)
{
- strtol_error e = humblock (spec, block_size);
+ int opts;
+ strtol_error e = humblock (spec, block_size, &opts);
if (*block_size == 0)
{
*block_size = default_block_size ();
@@ -359,4 +497,5 @@ human_block_size (char const *spec, int
}
if (e != LONGINT_OK && report_errors)
STRTOL_FATAL_ERROR (spec, _("block size"), e);
+ return opts;
}
diff -Naurp findutils-4.1.20/gnulib/lib/human.h
findutils-4.1.20-human/gnulib/lib/human.h
--- findutils-4.1.20/gnulib/lib/human.h Mon Jan 6 04:38:36 2003
+++ findutils-4.1.20-human/gnulib/lib/human.h Thu Jun 5 01:34:42 2003
@@ -1,3 +1,24 @@
+/* human.h -- print human readable file size
+
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free
+ Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+/* Written by Paul Eggert and Larry McVoy. */
+
#ifndef HUMAN_H_
# define HUMAN_H_ 1
@@ -5,6 +26,9 @@
# include <config.h>
# endif
+# include <limits.h>
+# include <stdbool.h>
+
# if HAVE_INTTYPES_H
# include <inttypes.h>
# else
@@ -14,30 +38,52 @@
# endif
/* A conservative bound on the maximum length of a human-readable string.
- The output can be the product of the largest uintmax_t and the largest int,
- so add their sizes before converting to a bound on digits. */
-# define LONGEST_HUMAN_READABLE ((sizeof (uintmax_t) + sizeof (int)) \
- * CHAR_BIT / 3)
-
-# ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-# define PARAMS(Args) Args
-# else
-# define PARAMS(Args) ()
-# endif
-# endif
+ The output can be the square of the largest uintmax_t, so double
+ its size before converting to a bound.
+ 302 / 1000 is ceil (log10 (2.0)). Add 1 for integer division truncation.
+ Also, the output can have a thousands separator between every digit,
+ so multiply by MB_LEN_MAX + 1 and then subtract MB_LEN_MAX.
+ Finally, append 3, the maximum length of a suffix. */
+# define LONGEST_HUMAN_READABLE \
+ ((2 * sizeof (uintmax_t) * CHAR_BIT * 302 / 1000 + 1) * (MB_LEN_MAX + 1) \
+ - MB_LEN_MAX + 3)
-enum human_inexact_style
+/* Options for human_readable. */
+enum
{
- human_floor = -1,
- human_round_to_even = 0,
- human_ceiling = 1
+ /* Unless otherwise specified these options may be ORed together. */
+
+ /* The following three options are mutually exclusive. */
+ /* Round to plus infinity (default). */
+ human_ceiling = 0,
+ /* Round to nearest, ties to even. */
+ human_round_to_nearest = 1,
+ /* Round to minus infinity. */
+ human_floor = 2,
+
+ /* Group digits together, e.g. `1,000,000'. This uses the
+ locale-defined grouping; the traditional C locale does not group,
+ so this has effect only if some other locale is in use. */
+ human_group_digits = 4,
+
+ /* When autoscaling, suppress ".0" at end. */
+ human_suppress_point_zero = 8,
+
+ /* Scale output and use SI-style units, ignoring the output block size. */
+ human_autoscale = 16,
+
+ /* Prefer base 1024 to base 1000. */
+ human_base_1024 = 32,
+
+ /* Append SI prefix, e.g. "k" or "M". */
+ human_SI = 64,
+
+ /* Append "B" (if base 1000) or "iB" (if base 1024) to SI prefix. */
+ human_B = 128
};
-char *human_readable PARAMS ((uintmax_t, char *, int, int));
-char *human_readable_inexact PARAMS ((uintmax_t, char *, int, int,
- enum human_inexact_style));
+char *human_readable (uintmax_t, char *, int, uintmax_t, uintmax_t);
-void human_block_size PARAMS ((char const *, int, int *));
+int human_options (char const *, bool, uintmax_t *);
#endif /* HUMAN_H_ */
diff -Naurp findutils-4.1.20/gnulib/lib/stdbool_.h
findutils-4.1.20-human/gnulib/lib/stdbool_.h
--- findutils-4.1.20/gnulib/lib/stdbool_.h Wed Dec 31 16:00:00 1969
+++ findutils-4.1.20-human/gnulib/lib/stdbool_.h Fri Jun 6 13:49:29 2003
@@ -0,0 +1,47 @@
+/* Copyright (C) 2001-2002 Free Software Foundation, Inc.
+ Written by Bruno Haible <address@hidden>, 2001.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#ifndef _STDBOOL_H
+#define _STDBOOL_H
+
+/* ISO C 99 <stdbool.h> for platforms that lack it. */
+
+/* 7.16. Boolean type and values */
+
+/* BeOS <sys/socket.h> already #defines false 0, true 1. We use the same
+ definitions below, but temporarily we have to #undef them. */
+#ifdef __BEOS__
+# undef false
+# undef true
+#endif
+
+/* For the sake of symbolic names in gdb, define _Bool as an enum type. */
+#ifndef __cplusplus
+# if address@hidden@
+typedef enum { false = 0, true = 1 } _Bool;
+# endif
+#else
+typedef bool _Bool;
+#endif
+#define bool _Bool
+
+/* The other macros must be usable in preprocessor directives. */
+#define false 0
+#define true 1
+#define __bool_true_false_are_defined 1
+
+#endif /* _STDBOOL_H */
diff -Naurp findutils-4.1.20/gnulib/m4/human.m4
findutils-4.1.20-human/gnulib/m4/human.m4
--- findutils-4.1.20/gnulib/m4/human.m4 Tue Dec 31 05:42:07 2002
+++ findutils-4.1.20-human/gnulib/m4/human.m4 Mon Jun 9 12:19:11 2003
@@ -1,5 +1,5 @@
-# human.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# human.m4 serial 3
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -9,9 +9,11 @@ dnl the same distribution terms as the r
AC_DEFUN([gl_HUMAN],
[
dnl Prerequisites of lib/human.h.
+ AC_REQUIRE([AM_STDBOOL_H])
AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
dnl Prerequisites of lib/human.c.
- AC_CHECK_HEADERS_ONCE(limits.h stdlib.h string.h)
- AC_CHECK_DECLS_ONCE([getenv])
+ AC_CHECK_HEADERS_ONCE(locale.h stdlib.h string.h)
+ AC_CHECK_DECLS_ONCE(getenv)
+ AC_CHECK_FUNCS_ONCE(localeconv)
])
diff -Naurp findutils-4.1.20/gnulib/m4/stdbool.m4
findutils-4.1.20-human/gnulib/m4/stdbool.m4
--- findutils-4.1.20/gnulib/m4/stdbool.m4 Wed Dec 31 16:00:00 1969
+++ findutils-4.1.20-human/gnulib/m4/stdbool.m4 Mon Jun 9 12:21:20 2003
@@ -0,0 +1,89 @@
+# Check for stdbool.h that conforms to C99.
+
+# Copyright (C) 2002-2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# Prepare for substituting <stdbool.h> if it is not supported.
+
+AC_DEFUN([AM_STDBOOL_H],
+[
+ AC_REQUIRE([AC_HEADER_STDBOOL])
+
+ # Define two additional variables used in the Makefile substitution.
+
+ if test "$ac_cv_header_stdbool_h" = yes; then
+ STDBOOL_H=''
+ else
+ STDBOOL_H='stdbool.h'
+ fi
+ AC_SUBST([STDBOOL_H])
+
+ if test "$ac_cv_type__Bool" = yes; then
+ HAVE__BOOL=1
+ else
+ HAVE__BOOL=0
+ fi
+ AC_SUBST([HAVE__BOOL])
+])
+
+# This macro is only needed in autoconf <= 2.54. Newer versions of autoconf
+# have this macro built-in.
+
+AC_DEFUN([AC_HEADER_STDBOOL],
+ [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
+ [ac_cv_header_stdbool_h],
+ [AC_TRY_COMPILE(
+ [
+ #include <stdbool.h>
+ #ifndef bool
+ "error: bool is not defined"
+ #endif
+ #ifndef false
+ "error: false is not defined"
+ #endif
+ #if false
+ "error: false is not 0"
+ #endif
+ #ifndef true
+ "error: false is not defined"
+ #endif
+ #if true != 1
+ "error: true is not 1"
+ #endif
+ #ifndef __bool_true_false_are_defined
+ "error: __bool_true_false_are_defined is not defined"
+ #endif
+
+ struct s { _Bool s: 1; _Bool t; } s;
+
+ char a[true == 1 ? 1 : -1];
+ char b[false == 0 ? 1 : -1];
+ char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+ char d[(bool) -0.5 == true ? 1 : -1];
+ bool e = &s;
+ char f[(_Bool) -0.0 == false ? 1 : -1];
+ char g[true];
+ char h[sizeof (_Bool)];
+ char i[sizeof s.t];
+ ],
+ [ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ],
+ [ac_cv_header_stdbool_h=yes],
+ [ac_cv_header_stdbool_h=no])])
+ AC_CHECK_TYPES([_Bool])
+ if test $ac_cv_header_stdbool_h = yes; then
+ AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.])
+ fi])
diff -Naurp findutils-4.1.20/lib/listfile.c
findutils-4.1.20-human/lib/listfile.c
--- findutils-4.1.20/lib/listfile.c Mon May 26 06:37:52 2003
+++ findutils-4.1.20-human/lib/listfile.c Mon Jun 9 12:33:56 2003
@@ -193,12 +193,14 @@ void print_name_with_quoting ();
STREAM is the stdio stream to print on. */
void
-list_file (name, relname, statp, current_time, output_block_size, stream)
+list_file (name, relname, statp, current_time, human_output_opts,
+ output_block_size, stream)
char *name;
char *relname;
struct stat *statp;
time_t current_time;
- int output_block_size;
+ int human_output_opts;
+ uintmax_t output_block_size;
FILE *stream;
{
char modebuf[11];
@@ -216,11 +218,12 @@ list_file (name, relname, statp, current
modebuf[10] = '\0';
fprintf (stream, "%6s ",
- human_readable ((uintmax_t) statp->st_ino, hbuf, 1, 1));
+ human_readable ((uintmax_t) statp->st_ino, hbuf, 0, 1, 1));
fprintf (stream, "%4s ",
human_readable ((uintmax_t) ST_NBLOCKS (*statp), hbuf,
- ST_NBLOCKSIZE, output_block_size));
+ human_output_opts, ST_NBLOCKSIZE,
+ output_block_size));
/* The space between the mode and the number of links is the POSIX
"optional alternate access method flag". */
@@ -248,8 +251,8 @@ list_file (name, relname, statp, current
#endif
else
fprintf (stream, "%8s ",
- human_readable ((uintmax_t) statp->st_size, hbuf, 1,
- output_block_size < 0 ? output_block_size : 1));
+ human_readable ((uintmax_t) statp->st_size, hbuf,
+ human_output_opts, 1, output_block_size));
if ((when_local = localtime (&statp->st_mtime)))
{
@@ -285,14 +288,14 @@ list_file (name, relname, statp, current
if (statp->st_mtime < 0)
{
char const *num = human_readable (- (uintmax_t) statp->st_mtime,
- hbuf, 1, 1);
+ hbuf, 0, 1, 1);
int sign_width = width - strlen (num);
fprintf (stream, "%*s%s ",
sign_width < 0 ? 0 : sign_width, "-", num);
}
else
fprintf (stream, "%*s ", width,
- human_readable ((uintmax_t) statp->st_mtime, hbuf, 1, 1));
+ human_readable ((uintmax_t) statp->st_mtime, hbuf, 0, 1, 1));
}
print_name_with_quoting (name, stream);
- Re: [Bug-gnulib] human.c merge from coreutils,
Paul Eggert <=