From 100a8e01f28671dd2f73a1541b1bbd15c9590947 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 31 Mar 2004 06:21:11 +0000 Subject: [PATCH] New module inttostr. --- ChangeLog | 4 ++++ lib/ChangeLog | 3 +++ lib/imaxtostr.c | 3 +++ lib/inttostr.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/inttostr.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/offtostr.c | 3 +++ lib/umaxtostr.c | 3 +++ m4/ChangeLog | 4 ++++ m4/inttostr.m4 | 32 ++++++++++++++++++++++++++++++++ modules/inttostr | 26 ++++++++++++++++++++++++++ 10 files changed, 176 insertions(+) create mode 100644 lib/imaxtostr.c create mode 100644 lib/inttostr.c create mode 100644 lib/inttostr.h create mode 100644 lib/offtostr.c create mode 100644 lib/umaxtostr.c create mode 100644 m4/inttostr.m4 create mode 100644 modules/inttostr diff --git a/ChangeLog b/ChangeLog index 67003cb6f..0984c5c2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-03-30 Paul Eggert + + * modules/inttostr: New file. + 2004-03-29 Paul Eggert * modules/getloadvg: Depend on cloexec and xalloc. diff --git a/lib/ChangeLog b/lib/ChangeLog index 863666ceb..fc6a5ec98 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,5 +1,8 @@ 2004-03-30 Paul Eggert + * imaxtostr.c, inttostr.c, inttostr.h, offtostr.c, umaxtostr.c: + New files. + * lib/cloexec.h, lib/cloexec.c (set_cloexec_flag): Return int not bool, to be more consistent with Unix conventions. Suggested by Bruno Haible. diff --git a/lib/imaxtostr.c b/lib/imaxtostr.c new file mode 100644 index 000000000..5e87ad526 --- /dev/null +++ b/lib/imaxtostr.c @@ -0,0 +1,3 @@ +#define inttostr imaxtostr +#define inttype intmax_t +#include "inttostr.c" diff --git a/lib/inttostr.c b/lib/inttostr.c new file mode 100644 index 000000000..78a48af84 --- /dev/null +++ b/lib/inttostr.c @@ -0,0 +1,49 @@ +/* inttostr.c -- convert integers to printable strings + + Copyright (C) 2001 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program 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 this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/* Written by Paul Eggert */ + +#include "inttostr.h" + +/* Convert I to a printable string in BUF, which must be at least + INT_BUFSIZE_BOUND (INTTYPE) bytes long. Return the address of the + printable string, which need not start at BUF. */ + +char * +inttostr (inttype i, char *buf) +{ + char *p = buf + INT_STRLEN_BOUND (inttype); + *p = 0; + + if (i < 0) + { + do + *--p = '0' - i % 10; + while ((i /= 10) != 0); + + *--p = '-'; + } + else + { + do + *--p = '0' + i % 10; + while ((i /= 10) != 0); + } + + return p; +} diff --git a/lib/inttostr.h b/lib/inttostr.h new file mode 100644 index 000000000..de2b164f6 --- /dev/null +++ b/lib/inttostr.h @@ -0,0 +1,49 @@ +/* inttostr.h -- convert integers to printable strings + + Copyright (C) 2001, 2002, 2003 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program 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 this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/* Written by Paul Eggert */ + +#if HAVE_CONFIG_H +# include +#endif + +#if HAVE_INTTYPES_H +# include +#endif + +#if HAVE_LIMITS_H +# include +#endif +#ifndef CHAR_BIT +# define CHAR_BIT 8 +#endif + +#if HAVE_SYS_TYPES_H +# include +#endif + +/* Upper bound on the string length of an integer converted to string. + 302 / 1000 is ceil (log10 (2.0)). Subtract 1 for the sign bit; + add 1 for integer division truncation; add 1 more for a minus sign. */ +#define INT_STRLEN_BOUND(t) ((sizeof (t) * CHAR_BIT - 1) * 302 / 1000 + 2) + +#define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1) + +char *offtostr (off_t, char *); +char *imaxtostr (intmax_t, char *); +char *umaxtostr (uintmax_t, char *); diff --git a/lib/offtostr.c b/lib/offtostr.c new file mode 100644 index 000000000..45196e28a --- /dev/null +++ b/lib/offtostr.c @@ -0,0 +1,3 @@ +#define inttostr offtostr +#define inttype off_t +#include "inttostr.c" diff --git a/lib/umaxtostr.c b/lib/umaxtostr.c new file mode 100644 index 000000000..4f49a7f8d --- /dev/null +++ b/lib/umaxtostr.c @@ -0,0 +1,3 @@ +#define inttostr umaxtostr +#define inttype uintmax_t +#include "inttostr.c" diff --git a/m4/ChangeLog b/m4/ChangeLog index f1c91cfcd..308414f26 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2004-03-30 Paul Eggert + + * inttostr.m4: New file. + 2004-03-29 Paul Eggert * cloexec.m4: New file. diff --git a/m4/inttostr.m4 b/m4/inttostr.m4 new file mode 100644 index 000000000..c1144fe5a --- /dev/null +++ b/m4/inttostr.m4 @@ -0,0 +1,32 @@ +# inttostr.m4 serial 1 +dnl Copyright (C) 2004 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +AC_DEFUN([gl_INTTOSTR], +[ + gl_PREREQ_INTTOSTR + gl_PREREQ_IMAXTOSTR + gl_PREREQ_OFFTOSTR + gl_PREREQ_UMAXTOSTR +]) + +# Prerequisites of lib/inttostr.h. +AC_DEFUN([gl_PREREQ_INTTOSTR], [ + AC_REQUIRE([jm_AC_TYPE_INTMAX_T]) + AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) + AC_REQUIRE([AC_TYPE_OFF_T]) + : +]) + +# Prerequisites of lib/imaxtostr.c. +AC_DEFUN([gl_PREREQ_IMAXTOSTR], [:]) + +# Prerequisites of lib/offtostr.c. +AC_DEFUN([gl_PREREQ_OFFTOSTR], [:]) + +# Prerequisites of lib/umaxtostr.c. +AC_DEFUN([gl_PREREQ_UMAXTOSTR], [:]) diff --git a/modules/inttostr b/modules/inttostr new file mode 100644 index 000000000..2b46d79ce --- /dev/null +++ b/modules/inttostr @@ -0,0 +1,26 @@ +Description: +Convert integers to printable strings. + +Files: +lib/imaxtostr.c +lib/inttostr.c +lib/inttostr.h +lib/offtostr.c +lib/umaxtostr.c +m4/intmax_t.m4 +m4/inttostr.m4 +m4/uintmax_t.m4 + +Depends-on: + +configure.ac: +gl_INTTOSTR + +Makefile.am: +lib_SOURCES += imaxtostr.c inttostr.c inttostr.h offtostr.c umaxtostr.c + +Include: +"inttostr.h" + +Maintainer: +Paul Eggert -- 2.11.0