Mercurial > hg > octave-kai > gnulib-hg

annotate lib/human.c @ 11639:b2e769838448

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hash: fix memory leak in last patch * lib/hash.c (hash_rehash): Avoid memory leak. Signed-off-by: Eric Blake <ebb9@byu.net>
author Eric Blake <ebb9@byu.net>
date Thu, 18 Jun 2009 15:24:38 -0600
parents bbbbbf4cd1c5
children e8d2c6fc33ad
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
1 /* human.c -- print human readable file size
3688
0cd372c853e5 (suffixes): Prefer K to k for 1024.
Jim Meyering <jim@meyering.net>
parents: 2593
diff changeset
2
7302
8a1a9361108c * _fpending.c: Include <config.h> unconditionally, since we no
Paul Eggert <eggert@cs.ucla.edu>
parents: 6259
diff changeset
3 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
9137
629a6928f108 * NEWS: Describe interface changes to human, xstrtol.
Paul Eggert <eggert@cs.ucla.edu>
parents: 9127
diff changeset
4 2005, 2006, 2007 Free Software Foundation, Inc.
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
5
9309
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 9137
diff changeset
6 This program is free software: you can redistribute it and/or modify
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
7 it under the terms of the GNU General Public License as published by
9309
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 9137
diff changeset
8 the Free Software Foundation; either version 3 of the License, or
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 9137
diff changeset
9 (at your option) any later version.
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
10
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
11 This program is distributed in the hope that it will be useful,
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
14 GNU General Public License for more details.
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
15
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
16 You should have received a copy of the GNU General Public License
9309
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 9137
diff changeset
17 along with this program. If not, see <http://www.gnu.org/licenses/>. */
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
18
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
19 /* Written by Paul Eggert and Larry McVoy. */
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
20
7302
8a1a9361108c * _fpending.c: Include <config.h> unconditionally, since we no
Paul Eggert <eggert@cs.ucla.edu>
parents: 6259
diff changeset
21 #include <config.h>
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
22
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
23 #include "human.h"
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
24
5510
fd10cf72c81b Import chamges from coreutils, so that the code now assumes
Paul Eggert <eggert@cs.ucla.edu>
parents: 5458
diff changeset
25 #include <locale.h>
4543
a6b4c227ffae Include stdio.h, for sprintf.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4351
diff changeset
26 #include <stdio.h>
4658
6ef2ff78cbad Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4620
diff changeset
27 #include <stdlib.h>
6ef2ff78cbad Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4620
diff changeset
28 #include <string.h>
4543
a6b4c227ffae Include stdio.h, for sprintf.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4351
diff changeset
29
1391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
30 #include <argmatch.h>
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
31 #include <error.h>
5691
ec62790f0938 Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents: 5569
diff changeset
32 #include <intprops.h>
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
33
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
34 /* The maximum length of a suffix like "KiB". */
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
35 #define HUMAN_READABLE_SUFFIX_LENGTH_MAX 3
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
36
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
37 static const char power_letter[] =
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
38 {
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
39 0, /* not used */
3688
0cd372c853e5 (suffixes): Prefer K to k for 1024.
Jim Meyering <jim@meyering.net>
parents: 2593
diff changeset
40 'K', /* kibi ('k' for kilo is a special case) */
0cd372c853e5 (suffixes): Prefer K to k for 1024.
Jim Meyering <jim@meyering.net>
parents: 2593
diff changeset
41 'M', /* mega or mebi */
0cd372c853e5 (suffixes): Prefer K to k for 1024.
Jim Meyering <jim@meyering.net>
parents: 2593
diff changeset
42 'G', /* giga or gibi */
0cd372c853e5 (suffixes): Prefer K to k for 1024.
Jim Meyering <jim@meyering.net>
parents: 2593
diff changeset
43 'T', /* tera or tebi */
0cd372c853e5 (suffixes): Prefer K to k for 1024.
Jim Meyering <jim@meyering.net>
parents: 2593
diff changeset
44 'P', /* peta or pebi */
0cd372c853e5 (suffixes): Prefer K to k for 1024.
Jim Meyering <jim@meyering.net>
parents: 2593
diff changeset
45 'E', /* exa or exbi */
0cd372c853e5 (suffixes): Prefer K to k for 1024.
Jim Meyering <jim@meyering.net>
parents: 2593
diff changeset
46 'Z', /* zetta or 2**70 */
0cd372c853e5 (suffixes): Prefer K to k for 1024.
Jim Meyering <jim@meyering.net>
parents: 2593
diff changeset
47 'Y' /* yotta or 2**80 */
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
48 };
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
49
3688
0cd372c853e5 (suffixes): Prefer K to k for 1024.
Jim Meyering <jim@meyering.net>
parents: 2593
diff changeset
50
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
51 /* If INEXACT_STYLE is not human_round_to_nearest, and if easily
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
52 possible, adjust VALUE according to the style. */
3688
0cd372c853e5 (suffixes): Prefer K to k for 1024.
Jim Meyering <jim@meyering.net>
parents: 2593
diff changeset
53
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
54 static long double
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
55 adjust_value (int inexact_style, long double value)
2593
3ebe28cfe9b4 (adjust_value): New function.
Jim Meyering <jim@meyering.net>
parents: 2590
diff changeset
56 {
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
57 /* Do not use the floorl or ceill functions, as that would mean
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
58 checking for their presence and possibly linking with the
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
59 standard math library, which is a porting pain. So leave the
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
60 value alone if it is too large to easily round. */
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
61 if (inexact_style != human_round_to_nearest && value < UINTMAX_MAX)
2593
3ebe28cfe9b4 (adjust_value): New function.
Jim Meyering <jim@meyering.net>
parents: 2590
diff changeset
62 {
3ebe28cfe9b4 (adjust_value): New function.
Jim Meyering <jim@meyering.net>
parents: 2590
diff changeset
63 uintmax_t u = value;
3ebe28cfe9b4 (adjust_value): New function.
Jim Meyering <jim@meyering.net>
parents: 2590
diff changeset
64 value = u + (inexact_style == human_ceiling && u != value);
3ebe28cfe9b4 (adjust_value): New function.
Jim Meyering <jim@meyering.net>
parents: 2590
diff changeset
65 }
3ebe28cfe9b4 (adjust_value): New function.
Jim Meyering <jim@meyering.net>
parents: 2590
diff changeset
66
3ebe28cfe9b4 (adjust_value): New function.
Jim Meyering <jim@meyering.net>
parents: 2590
diff changeset
67 return value;
3ebe28cfe9b4 (adjust_value): New function.
Jim Meyering <jim@meyering.net>
parents: 2590
diff changeset
68 }
3ebe28cfe9b4 (adjust_value): New function.
Jim Meyering <jim@meyering.net>
parents: 2590
diff changeset
69
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
70 /* Group the digits of NUMBER according to the grouping rules of the
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
71 current locale. NUMBER contains NUMBERLEN digits. Modify the
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
72 bytes pointed to by NUMBER in place, subtracting 1 from NUMBER for
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
73 each byte inserted. Return the starting address of the modified
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
74 number.
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
75
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
76 To group the digits, use GROUPING and THOUSANDS_SEP as in `struct
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
77 lconv' from <locale.h>. */
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
78
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
79 static char *
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
80 group_number (char *number, size_t numberlen,
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
81 char const *grouping, char const *thousands_sep)
1863
e6b535c4a46e (human_readable): New function.
Jim Meyering <jim@meyering.net>
parents: 1848
diff changeset
82 {
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
83 register char *d;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
84 size_t grouplen = SIZE_MAX;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
85 size_t thousands_seplen = strlen (thousands_sep);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
86 size_t i = numberlen;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
87
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
88 /* The maximum possible value for NUMBERLEN is the number of digits
5691
ec62790f0938 Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents: 5569
diff changeset
89 in the square of the largest uintmax_t, so double the size needed. */
ec62790f0938 Factor int-properties macros into a single file, except for
Paul Eggert <eggert@cs.ucla.edu>
parents: 5569
diff changeset
90 char buf[2 * INT_STRLEN_BOUND (uintmax_t) + 1];
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
91
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
92 memcpy (buf, number, numberlen);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
93 d = number + numberlen;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
94
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
95 for (;;)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
96 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
97 unsigned char g = *grouping;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
98
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
99 if (g)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
100 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
101 grouplen = g < CHAR_MAX ? g : i;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
102 grouping++;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
103 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
104
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
105 if (i < grouplen)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
106 grouplen = i;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
107
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
108 d -= grouplen;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
109 i -= grouplen;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
110 memcpy (d, buf + i, grouplen);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
111 if (i == 0)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
112 return d;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
113
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
114 d -= thousands_seplen;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
115 memcpy (d, thousands_sep, thousands_seplen);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
116 }
1863
e6b535c4a46e (human_readable): New function.
Jim Meyering <jim@meyering.net>
parents: 1848
diff changeset
117 }
e6b535c4a46e (human_readable): New function.
Jim Meyering <jim@meyering.net>
parents: 1848
diff changeset
118
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
119 /* Convert N to a human readable format in BUF, using the options OPTS.
1142
ff40370aead6 (human_readable): Convert to ANSI-style definition.
Jim Meyering <jim@meyering.net>
parents: 1137
diff changeset
120
1391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
121 N is expressed in units of FROM_BLOCK_SIZE. FROM_BLOCK_SIZE must
1848
afab915d3e18 (human_readable): Allow from_block_size to be zero.
Jim Meyering <jim@meyering.net>
parents: 1841
diff changeset
122 be nonnegative.
1391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
123
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
124 Use units of TO_BLOCK_SIZE in the output number. TO_BLOCK_SIZE
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
125 must be positive.
1142
ff40370aead6 (human_readable): Convert to ANSI-style definition.
Jim Meyering <jim@meyering.net>
parents: 1137
diff changeset
126
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
127 Use (OPTS & (human_round_to_nearest | human_floor | human_ceiling))
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
128 to determine whether to take the ceiling or floor of any result
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
129 that cannot be expressed exactly.
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
130
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
131 If (OPTS & human_group_digits), group the thousands digits
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
132 according to the locale, e.g., `1,000,000' in an American English
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
133 locale.
1863
e6b535c4a46e (human_readable): New function.
Jim Meyering <jim@meyering.net>
parents: 1848
diff changeset
134
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
135 If (OPTS & human_autoscale), deduce the output block size
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
136 automatically; TO_BLOCK_SIZE must be 1 but it has no effect on the
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
137 output. Use powers of 1024 if (OPTS & human_base_1024), and powers
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
138 of 1000 otherwise. For example, assuming powers of 1024, 8500
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
139 would be converted to 8.3, 133456345 to 127, 56990456345 to 53, and
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
140 so on. Numbers smaller than the power aren't modified.
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
141 human_autoscale is normally used together with human_SI.
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
142
5458
81e1a3092078 Import from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 5159
diff changeset
143 If (OPTS & human_space_before_unit), use a space to separate the
81e1a3092078 Import from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 5159
diff changeset
144 number from any suffix that is appended as described below.
81e1a3092078 Import from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 5159
diff changeset
145
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
146 If (OPTS & human_SI), append an SI prefix indicating which power is
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
147 being used. If in addition (OPTS & human_B), append "B" (if base
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
148 1000) or "iB" (if base 1024) to the SI prefix. When ((OPTS &
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
149 human_SI) && ! (OPTS & human_autoscale)), TO_BLOCK_SIZE must be a
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
150 power of 1024 or of 1000, depending on (OPTS &
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
151 human_base_1024). */
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
152
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
153 char *
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
154 human_readable (uintmax_t n, char *buf, int opts,
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
155 uintmax_t from_block_size, uintmax_t to_block_size)
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
156 {
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
157 int inexact_style =
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
158 opts & (human_round_to_nearest | human_floor | human_ceiling);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
159 unsigned int base = opts & human_base_1024 ? 1024 : 1000;
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
160 uintmax_t amt;
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
161 int tenths;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
162 int exponent = -1;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
163 int exponent_max = sizeof power_letter - 1;
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
164 char *p;
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
165 char *psuffix;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
166 char const *integerlim;
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
167
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
168 /* 0 means adjusted N == AMT.TENTHS;
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
169 1 means AMT.TENTHS < adjusted N < AMT.TENTHS + 0.05;
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
170 2 means adjusted N == AMT.TENTHS + 0.05;
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
171 3 means AMT.TENTHS + 0.05 < adjusted N < AMT.TENTHS + 0.1. */
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
172 int rounding;
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
173
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
174 char const *decimal_point = ".";
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
175 size_t decimal_pointlen = 1;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
176 char const *grouping = "";
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
177 char const *thousands_sep = "";
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
178 struct lconv const *l = localeconv ();
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
179 size_t pointlen = strlen (l->decimal_point);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
180 if (0 < pointlen && pointlen <= MB_LEN_MAX)
1391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
181 {
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
182 decimal_point = l->decimal_point;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
183 decimal_pointlen = pointlen;
1391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
184 }
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
185 grouping = l->grouping;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
186 if (strlen (l->thousands_sep) <= MB_LEN_MAX)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
187 thousands_sep = l->thousands_sep;
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
188
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
189 psuffix = buf + LONGEST_HUMAN_READABLE - HUMAN_READABLE_SUFFIX_LENGTH_MAX;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
190 p = psuffix;
2590
a3c74265aa47 (human_readable_inexact): Allow an input block
Jim Meyering <jim@meyering.net>
parents: 2293
diff changeset
191
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
192 /* Adjust AMT out of FROM_BLOCK_SIZE units and into TO_BLOCK_SIZE
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
193 units. If this can be done exactly with integer arithmetic, do
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
194 not use floating point operations. */
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
195 if (to_block_size <= from_block_size)
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
196 {
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
197 if (from_block_size % to_block_size == 0)
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
198 {
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
199 uintmax_t multiplier = from_block_size / to_block_size;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
200 amt = n * multiplier;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
201 if (amt / multiplier == n)
1863
e6b535c4a46e (human_readable): New function.
Jim Meyering <jim@meyering.net>
parents: 1848
diff changeset
202 {
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
203 tenths = 0;
1863
e6b535c4a46e (human_readable): New function.
Jim Meyering <jim@meyering.net>
parents: 1848
diff changeset
204 rounding = 0;
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
205 goto use_integer_arithmetic;
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
206 }
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
207 }
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
208 }
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
209 else if (from_block_size != 0 && to_block_size % from_block_size == 0)
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
210 {
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
211 uintmax_t divisor = to_block_size / from_block_size;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
212 uintmax_t r10 = (n % divisor) * 10;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
213 uintmax_t r2 = (r10 % divisor) * 2;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
214 amt = n / divisor;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
215 tenths = r10 / divisor;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
216 rounding = r2 < divisor ? 0 < r2 : 2 + (divisor < r2);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
217 goto use_integer_arithmetic;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
218 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
219
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
220 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
221 /* Either the result cannot be computed easily using uintmax_t,
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
222 or from_block_size is zero. Fall back on floating point.
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
223 FIXME: This can yield answers that are slightly off. */
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
224
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
225 long double dto_block_size = to_block_size;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
226 long double damt = n * (from_block_size / dto_block_size);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
227 size_t buflen;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
228 size_t nonintegerlen;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
229
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
230 if (! (opts & human_autoscale))
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
231 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
232 sprintf (buf, "%.0Lf", adjust_value (inexact_style, damt));
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
233 buflen = strlen (buf);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
234 nonintegerlen = 0;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
235 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
236 else
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
237 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
238 long double e = 1;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
239 exponent = 0;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
240
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
241 do
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
242 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
243 e *= base;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
244 exponent++;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
245 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
246 while (e * base <= damt && exponent < exponent_max);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
247
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
248 damt /= e;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
249
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
250 sprintf (buf, "%.1Lf", adjust_value (inexact_style, damt));
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
251 buflen = strlen (buf);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
252 nonintegerlen = decimal_pointlen + 1;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
253
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
254 if (1 + nonintegerlen + ! (opts & human_base_1024) < buflen
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
255 || ((opts & human_suppress_point_zero)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
256 && buf[buflen - 1] == '0'))
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
257 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
258 sprintf (buf, "%.0Lf",
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
259 adjust_value (inexact_style, damt * 10) / 10);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
260 buflen = strlen (buf);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
261 nonintegerlen = 0;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
262 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
263 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
264
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
265 p = psuffix - buflen;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
266 memmove (p, buf, buflen);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
267 integerlim = p + buflen - nonintegerlen;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
268 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
269 goto do_grouping;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
270
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
271 use_integer_arithmetic:
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
272 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
273 /* The computation can be done exactly, with integer arithmetic.
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
274
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
275 Use power of BASE notation if requested and if adjusted AMT is
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
276 large enough. */
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
277
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
278 if (opts & human_autoscale)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
279 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
280 exponent = 0;
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
281
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
282 if (base <= amt)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
283 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
284 do
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
285 {
5159
a535859efd14 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4985
diff changeset
286 unsigned int r10 = (amt % base) * 10 + tenths;
a535859efd14 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4985
diff changeset
287 unsigned int r2 = (r10 % base) * 2 + (rounding >> 1);
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
288 amt /= base;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
289 tenths = r10 / base;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
290 rounding = (r2 < base
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
291 ? (r2 + rounding) != 0
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
292 : 2 + (base < r2 + rounding));
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
293 exponent++;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
294 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
295 while (base <= amt && exponent < exponent_max);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
296
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
297 if (amt < 10)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
298 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
299 if (inexact_style == human_round_to_nearest
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
300 ? 2 < rounding + (tenths & 1)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
301 : inexact_style == human_ceiling && 0 < rounding)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
302 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
303 tenths++;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
304 rounding = 0;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
305
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
306 if (tenths == 10)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
307 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
308 amt++;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
309 tenths = 0;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
310 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
311 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
312
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
313 if (amt < 10
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
314 && (tenths || ! (opts & human_suppress_point_zero)))
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
315 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
316 *--p = '0' + tenths;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
317 p -= decimal_pointlen;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
318 memcpy (p, decimal_point, decimal_pointlen);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
319 tenths = rounding = 0;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
320 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
321 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
322 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
323 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
324
4620
b0acbb185a60 (human_readable): Fix bug that rounded 10501 to 10k.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4543
diff changeset
325 if (inexact_style == human_round_to_nearest
b0acbb185a60 (human_readable): Fix bug that rounded 10501 to 10k.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4543
diff changeset
326 ? 5 < tenths + (0 < rounding + (amt & 1))
b0acbb185a60 (human_readable): Fix bug that rounded 10501 to 10k.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4543
diff changeset
327 : inexact_style == human_ceiling && 0 < tenths + rounding)
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
328 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
329 amt++;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
330
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
331 if ((opts & human_autoscale)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
332 && amt == base && exponent < exponent_max)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
333 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
334 exponent++;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
335 if (! (opts & human_suppress_point_zero))
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
336 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
337 *--p = '0';
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
338 p -= decimal_pointlen;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
339 memcpy (p, decimal_point, decimal_pointlen);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
340 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
341 amt = 1;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
342 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
343 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
344
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
345 integerlim = p;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
346
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
347 do
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
348 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
349 int digit = amt % 10;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
350 *--p = digit + '0';
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
351 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
352 while ((amt /= 10) != 0);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
353 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
354
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
355 do_grouping:
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
356 if (opts & human_group_digits)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
357 p = group_number (p, integerlim - p, grouping, thousands_sep);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
358
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
359 if (opts & human_SI)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
360 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
361 if (exponent < 0)
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
362 {
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
363 uintmax_t power;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
364 exponent = 0;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
365 for (power = 1; power < to_block_size; power *= base)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
366 if (++exponent == exponent_max)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
367 break;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
368 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
369
5458
81e1a3092078 Import from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 5159
diff changeset
370 if ((exponent | (opts & human_B)) && (opts & human_space_before_unit))
81e1a3092078 Import from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 5159
diff changeset
371 *psuffix++ = ' ';
81e1a3092078 Import from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 5159
diff changeset
372
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
373 if (exponent)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
374 *psuffix++ = (! (opts & human_base_1024) && exponent == 1
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
375 ? 'k'
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
376 : power_letter[exponent]);
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
377
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
378 if (opts & human_B)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
379 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
380 if ((opts & human_base_1024) && exponent)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
381 *psuffix++ = 'i';
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
382 *psuffix++ = 'B';
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
383 }
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
384 }
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
385
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
386 *psuffix = '\0';
1137
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
387
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
388 return p;
2c9059ccc457 New file. The interface is inspired
Jim Meyering <jim@meyering.net>
parents:
diff changeset
389 }
1391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
390
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
392 /* The default block size used for output. This number may change in
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
393 the future as disks get larger. */
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
394 #ifndef DEFAULT_BLOCK_SIZE
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
395 # define DEFAULT_BLOCK_SIZE 1024
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
396 #endif
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
397
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
398 static char const *const block_size_args[] = { "human-readable", "si", 0 };
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
399 static int const block_size_opts[] =
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
400 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
401 human_autoscale + human_SI + human_base_1024,
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
402 human_autoscale + human_SI
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
403 };
1391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
404
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
405 static uintmax_t
2008
2d8ab27e705c (default_block_size): New function.
Jim Meyering <jim@meyering.net>
parents: 1863
diff changeset
406 default_block_size (void)
2d8ab27e705c (default_block_size): New function.
Jim Meyering <jim@meyering.net>
parents: 1863
diff changeset
407 {
2d8ab27e705c (default_block_size): New function.
Jim Meyering <jim@meyering.net>
parents: 1863
diff changeset
408 return getenv ("POSIXLY_CORRECT") ? 512 : DEFAULT_BLOCK_SIZE;
2d8ab27e705c (default_block_size): New function.
Jim Meyering <jim@meyering.net>
parents: 1863
diff changeset
409 }
2d8ab27e705c (default_block_size): New function.
Jim Meyering <jim@meyering.net>
parents: 1863
diff changeset
410
1391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
411 static strtol_error
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
412 humblock (char const *spec, uintmax_t *block_size, int *options)
1391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
413 {
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
414 int i;
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
415 int opts = 0;
1391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
416
4985
41bd93f66780 (humblock): Inspect BLOCKSIZE if BLOCK_SIZE isn't set.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4788
diff changeset
417 if (! spec
41bd93f66780 (humblock): Inspect BLOCKSIZE if BLOCK_SIZE isn't set.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4788
diff changeset
418 && ! (spec = getenv ("BLOCK_SIZE"))
41bd93f66780 (humblock): Inspect BLOCKSIZE if BLOCK_SIZE isn't set.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4788
diff changeset
419 && ! (spec = getenv ("BLOCKSIZE")))
2008
2d8ab27e705c (default_block_size): New function.
Jim Meyering <jim@meyering.net>
parents: 1863
diff changeset
420 *block_size = default_block_size ();
1391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
421 else
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
422 {
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
423 if (*spec == '\'')
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
424 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
425 opts |= human_group_digits;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
426 spec++;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
427 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
428
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
429 if (0 <= (i = ARGMATCH (spec, block_size_args, block_size_opts)))
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
430 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
431 opts |= block_size_opts[i];
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
432 *block_size = 1;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
433 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
434 else
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
435 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
436 char *ptr;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
437 strtol_error e = xstrtoumax (spec, &ptr, 0, block_size,
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
438 "eEgGkKmMpPtTyYzZ0");
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
439 if (e != LONGINT_OK)
5791
2ef479ccc298 (humblock): Set *options even when returning due to
Jim Meyering <jim@meyering.net>
parents: 5691
diff changeset
440 {
2ef479ccc298 (humblock): Set *options even when returning due to
Jim Meyering <jim@meyering.net>
parents: 5691
diff changeset
441 *options = 0;
2ef479ccc298 (humblock): Set *options even when returning due to
Jim Meyering <jim@meyering.net>
parents: 5691
diff changeset
442 return e;
2ef479ccc298 (humblock): Set *options even when returning due to
Jim Meyering <jim@meyering.net>
parents: 5691
diff changeset
443 }
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
444 for (; ! ('0' <= *spec && *spec <= '9'); spec++)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
445 if (spec == ptr)
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
446 {
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
447 opts |= human_SI;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
448 if (ptr[-1] == 'B')
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
449 opts |= human_B;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
450 if (ptr[-1] != 'B' || ptr[-2] == 'i')
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
451 opts |= human_base_1024;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
452 break;
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
453 }
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
454 }
1391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
455 }
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
456
4351
d0d257fdad20 Merge human.c changes from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4333
diff changeset
457 *options = opts;
1391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
458 return LONGINT_OK;
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
459 }
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
460
9137
629a6928f108 * NEWS: Describe interface changes to human, xstrtol.
Paul Eggert <eggert@cs.ucla.edu>
parents: 9127
diff changeset
461 enum strtol_error
629a6928f108 * NEWS: Describe interface changes to human, xstrtol.
Paul Eggert <eggert@cs.ucla.edu>
parents: 9127
diff changeset
462 human_options (char const *spec, int *opts, uintmax_t *block_size)
1391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
463 {
9137
629a6928f108 * NEWS: Describe interface changes to human, xstrtol.
Paul Eggert <eggert@cs.ucla.edu>
parents: 9127
diff changeset
464 strtol_error e = humblock (spec, block_size, opts);
2008
2d8ab27e705c (default_block_size): New function.
Jim Meyering <jim@meyering.net>
parents: 1863
diff changeset
465 if (*block_size == 0)
2d8ab27e705c (default_block_size): New function.
Jim Meyering <jim@meyering.net>
parents: 1863
diff changeset
466 {
2d8ab27e705c (default_block_size): New function.
Jim Meyering <jim@meyering.net>
parents: 1863
diff changeset
467 *block_size = default_block_size ();
2d8ab27e705c (default_block_size): New function.
Jim Meyering <jim@meyering.net>
parents: 1863
diff changeset
468 e = LONGINT_INVALID;
2d8ab27e705c (default_block_size): New function.
Jim Meyering <jim@meyering.net>
parents: 1863
diff changeset
469 }
9137
629a6928f108 * NEWS: Describe interface changes to human, xstrtol.
Paul Eggert <eggert@cs.ucla.edu>
parents: 9127
diff changeset
470 return e;
1391
c9a7b76bd443 * lib/human.c, lib/human.h (human_readable): Coalesce last two args
Jim Meyering <jim@meyering.net>
parents: 1142
diff changeset
471 }