From: Jim Meyering <jim@meyering.net>
Date: Wed, 15 Oct 2003 07:26:01 +0000 (+0000)
Subject: Sync with gnulib.
X-Git-Tag: v5.1.0~407
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7edceab01c96c3847b7f22f70357ab8418c2e8dc;p=thirdparty%2Fcoreutils.git

Sync with gnulib.
---

diff --git a/lib/human.c b/lib/human.c
index b342bf1784..36cfd73488 100644
--- a/lib/human.c
+++ b/lib/human.c
@@ -450,8 +450,6 @@ humblock (char const *spec, uintmax_t *block_size, int *options)
 				       "eEgGkKmMpPtTyYzZ0");
 	  if (e != LONGINT_OK)
 	    return e;
-	  if (*ptr)
-	    return LONGINT_INVALID_SUFFIX_CHAR;
 	  for (; ! ('0' <= *spec && *spec <= '9'); spec++)
 	    if (spec == ptr)
 	      {
diff --git a/lib/xstrtoimax.c b/lib/xstrtoimax.c
index 94c6577864..2ba136772c 100644
--- a/lib/xstrtoimax.c
+++ b/lib/xstrtoimax.c
@@ -30,4 +30,8 @@
 #define __strtol strtoimax
 #define __strtol_t intmax_t
 #define __xstrtol xstrtoimax
+#ifdef INTMAX_MAX
+# define STRTOL_T_MINIMUM INTMAX_MIN
+# define STRTOL_T_MAXIMUM INTMAX_MAX
+#endif
 #include "xstrtol.c"