projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid using non-constant initializers for struct pentry_state.
[gnulib.git]
/
lib
/
human.c
diff --git
a/lib/human.c
b/lib/human.c
index
285e4fd
..
6acc032
100644
(file)
--- a/
lib/human.c
+++ b/
lib/human.c
@@
-1,7
+1,7
@@
/* human.c -- print human readable file size
/* human.c -- print human readable file size
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
Free
- Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
, 2004, 2005
+
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
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
@@
-25,36
+25,10
@@
#include "human.h"
#include "human.h"
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#endif
-#ifndef UINTMAX_MAX
-# define UINTMAX_MAX ((uintmax_t) -1)
-#endif
-
-#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
-#if !HAVE_DECL_GETENV
-char *getenv ();
-#endif
-
-#if HAVE_STRING_H
-# include <string.h>
-#endif
-
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
+#include <locale.h>
#include <stdio.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-63,6
+37,13
@@
char *getenv ();
#include <error.h>
#include <xstrtol.h>
#include <error.h>
#include <xstrtol.h>
+#ifndef SIZE_MAX
+# define SIZE_MAX ((size_t) -1)
+#endif
+#ifndef UINTMAX_MAX
+# define UINTMAX_MAX ((uintmax_t) -1)
+#endif
+
/* The maximum length of a suffix like "KiB". */
#define HUMAN_READABLE_SUFFIX_LENGTH_MAX 3
/* The maximum length of a suffix like "KiB". */
#define HUMAN_READABLE_SUFFIX_LENGTH_MAX 3
@@
-174,6
+155,9
@@
group_number (char *number, size_t numberlen,
so on. Numbers smaller than the power aren't modified.
human_autoscale is normally used together with human_SI.
so on. Numbers smaller than the power aren't modified.
human_autoscale is normally used together with human_SI.
+ If (OPTS & human_space_before_unit), use a space to separate the
+ number from any suffix that is appended as described below.
+
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 &
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 &
@@
-206,7
+190,6
@@
human_readable (uintmax_t n, char *buf, int opts,
size_t decimal_pointlen = 1;
char const *grouping = "";
char const *thousands_sep = "";
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)
struct lconv const *l = localeconv ();
size_t pointlen = strlen (l->decimal_point);
if (0 < pointlen && pointlen <= MB_LEN_MAX)
@@
-217,7
+200,6
@@
human_readable (uintmax_t n, char *buf, int opts,
grouping = l->grouping;
if (strlen (l->thousands_sep) <= MB_LEN_MAX)
thousands_sep = l->thousands_sep;
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;
psuffix = buf + LONGEST_HUMAN_READABLE - HUMAN_READABLE_SUFFIX_LENGTH_MAX;
p = psuffix;
@@
-316,8
+298,8
@@
human_readable (uintmax_t n, char *buf, int opts,
{
do
{
{
do
{
- unsigned r10 = (amt % base) * 10 + tenths;
- unsigned r2 = (r10 % base) * 2 + (rounding >> 1);
+ unsigned
int
r10 = (amt % base) * 10 + tenths;
+ unsigned
int
r2 = (r10 % base) * 2 + (rounding >> 1);
amt /= base;
tenths = r10 / base;
rounding = (r2 < base
amt /= base;
tenths = r10 / base;
rounding = (r2 < base
@@
-400,6
+382,9
@@
human_readable (uintmax_t n, char *buf, int opts,
break;
}
break;
}
+ if ((exponent | (opts & human_B)) && (opts & human_space_before_unit))
+ *psuffix++ = ' ';
+
if (exponent)
*psuffix++ = (! (opts & human_base_1024) && exponent == 1
? 'k'
if (exponent)
*psuffix++ = (! (opts & human_base_1024) && exponent == 1
? 'k'
@@
-444,7
+429,9
@@
humblock (char const *spec, uintmax_t *block_size, int *options)
int i;
int opts = 0;
int i;
int opts = 0;
- if (! spec && ! (spec = getenv ("BLOCK_SIZE")))
+ if (! spec
+ && ! (spec = getenv ("BLOCK_SIZE"))
+ && ! (spec = getenv ("BLOCKSIZE")))
*block_size = default_block_size ();
else
{
*block_size = default_block_size ();
else
{
@@
-466,8
+453,6
@@
humblock (char const *spec, uintmax_t *block_size, int *options)
"eEgGkKmMpPtTyYzZ0");
if (e != LONGINT_OK)
return e;
"eEgGkKmMpPtTyYzZ0");
if (e != LONGINT_OK)
return e;
- if (*ptr)
- return LONGINT_INVALID_SUFFIX_CHAR;
for (; ! ('0' <= *spec && *spec <= '9'); spec++)
if (spec == ptr)
{
for (; ! ('0' <= *spec && *spec <= '9'); spec++)
if (spec == ptr)
{