projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* lib/ftruncate.c [HAVE_CHSIZE]: Document that this code is
[gnulib.git]
/
lib
/
human.c
diff --git
a/lib/human.c
b/lib/human.c
index
7933662
..
ecf4c97
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, 2004,
2005
- Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+
2005, 2006
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
@@
-15,13
+15,11
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* Written by Paul Eggert and Larry McVoy. */
/* Written by Paul Eggert and Larry McVoy. */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "human.h"
#include "human.h"
@@
-38,13
+36,6
@@
#include <intprops.h>
#include <xstrtol.h>
#include <intprops.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
@@
-451,7
+442,10
@@
humblock (char const *spec, uintmax_t *block_size, int *options)
strtol_error e = xstrtoumax (spec, &ptr, 0, block_size,
"eEgGkKmMpPtTyYzZ0");
if (e != LONGINT_OK)
strtol_error e = xstrtoumax (spec, &ptr, 0, block_size,
"eEgGkKmMpPtTyYzZ0");
if (e != LONGINT_OK)
- return e;
+ {
+ *options = 0;
+ return e;
+ }
for (; ! ('0' <= *spec && *spec <= '9'); spec++)
if (spec == ptr)
{
for (; ! ('0' <= *spec && *spec <= '9'); spec++)
if (spec == ptr)
{