No specific user configuration

[platform/upstream/bash.git] / lib / sh / itos.c

diff --git a/lib/sh/itos.c b/lib/sh/itos.c
index dee7883..cd36ef3 100644 (file)
--- a/lib/sh/itos.c
+++ b/lib/sh/itos.c
@@ -1,78 +1,84 @@
 /* itos.c -- Convert integer to string. */
 
-/* Copyright (C) 1998, Free Software Foundation, Inc.
+/* Copyright (C) 1998-2002 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
-   Bash 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.
+   Bash 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 3 of the License, or
+   (at your option) any later version.
 
-   Bash 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.
+   Bash 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 Bash; see the file COPYING.  If not, write to the Free Software
-   Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   You should have received a copy of the GNU General Public License
+   along with Bash.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #if defined (HAVE_UNISTD_H)
 #  include <unistd.h>
 #endif
 
-#include "bashansi.h"
+#include <bashansi.h>
 #include "shell.h"
 
-/* Number of characters that can appear in a string representation
-   of an integer.  32 is larger than the string rep of 2^^31 - 1. */
-#define MAX_INT_LEN 32
-
-/* Integer to string conversion.  The caller passes the buffer and
-   the size.  This should check for buffer underflow, but currently
-   does not. */
 char *
 inttostr (i, buf, len)
-     int i;
+     intmax_t i;
      char *buf;
-     int len;
+     size_t len;
 {
-  char *p;
-  int negative = 0;
-  unsigned int ui;
-
-  if (i < 0)
-    {
-      negative++;
-      i = -i;
-    }
+  return (fmtumax (i, 10, buf, len, 0));
+}
 
-  ui = (unsigned int) i;
+/* Integer to string conversion.  This conses the string; the
+   caller should free it. */
+char *
+itos (i)
+     intmax_t i;
+{
+  char *p, lbuf[INT_STRLEN_BOUND(intmax_t) + 1];
 
-  p = buf + len - 2;
-  p[1] = '\0';
+  p = fmtumax (i, 10, lbuf, sizeof(lbuf), 0);
+  return (savestring (p));
+}
 
-  do
-    *p-- = (ui % 10) + '0';
-  while (ui /= 10);
+/* Integer to string conversion.  This conses the string using strdup;
+   caller should free it and be prepared to deal with NULL return. */
+char *
+mitos (i)
+     intmax_t i;
+{
+  char *p, lbuf[INT_STRLEN_BOUND(intmax_t) + 1];
 
-  if (negative)
-    *p-- = '-';
+  p = fmtumax (i, 10, lbuf, sizeof(lbuf), 0);
+  return (strdup (p));
+}
 
-  return (p + 1);
+char *
+uinttostr (i, buf, len)
+     uintmax_t i;
+     char *buf;
+     size_t len;
+{
+  return (fmtumax (i, 10, buf, len, FL_UNSIGNED));
 }
 
 /* Integer to string conversion.  This conses the string; the
    caller should free it. */
 char *
-itos (i)
-     int i;
+uitos (i)
+     uintmax_t i;
 {
-  char *p, lbuf[MAX_INT_LEN];
+  char *p, lbuf[INT_STRLEN_BOUND(uintmax_t) + 1];
 
-  p = inttostr (i, lbuf, sizeof(lbuf));
+  p = fmtumax (i, 10, lbuf, sizeof(lbuf), FL_UNSIGNED);
   return (savestring (p));
 }