2003-05-28 Paul Eggert <eggert@twinsun.com>
+ Assume the headers required for C89 freestanding compilers.
+ * addext.c, backupfile.c, fsusage.c, human.c, pathmax.h,
+ rpmatch.c, userspec.c, xreadlink.c, xstrtol.c: Include <limits.h>
+ without checking for HAVE_LIMITS_H.
+ * backupfile.c, fsusage.c, hash.c, human.c, safe-read.c, userspec.c,
+ xstrtol.c (CHAR_BIT) : Don't define, since <limits.h> is guaranteed
+ to do that.
+ * fatal.c: Include <stdarg.h> without checking for __STDC__.
+ * exclude.c: Include <stdbool.h> unconditionally.
+ * tempname.c: Include <stddef.h> unconditionally.
+ * hash.c: Include <limits.h>, since we no longer define CHAR_BIT.
+ * modechange.c, rpmatch.c (NULL): Don't define, since
+ <stddef.h> does that.
+ * quote.c: Dont include <stddef.h> or <sys/types.h>; not needed.
+ * safe-read.c (INT_MAX): Don't define, since <limits.h> does that.
+ * safe-read.c (TYPE_MINIMUM, TYPE_MAXIMUM): Remove; no longer needed.
+ * xstrtol.c: Likewise.
+ * safe-read.c: Remove TYPE_SIGNED; no longer needed.
+ * savedir.c: Include <stddef.h> instead of defining NULL.
+
* addext.c (addext): Use assignment rather than cast, to avoid
warnings on some platforms.
# define HAVE_LONG_FILE_NAMES 0
#endif
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
+#include <limits.h>
#ifndef _POSIX_NAME_MAX
# define _POSIX_NAME_MAX 14
#endif
/* backupfile.c -- make Emacs style backup file names
- Copyright (C) 1990,91,92,93,94,95,96,97,98,99,2000, 2001, 2002 Free Software
- Foundation, Inc.
+
+ Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+ 1999, 2000, 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
# define HAVE_DIR 0
#endif
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
-#ifndef CHAR_BIT
-# define CHAR_BIT 8
-#endif
+#include <limits.h>
+
/* 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. */
# include <config.h>
#endif
-#if HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-typedef enum {false = 0, true = 1} bool;
-#endif
+#include <stdbool.h>
#include <errno.h>
#ifndef errno
+/* Fatal exits for noninteractive utilities
+
+ Copyright (C) 2001, 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. */
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdio.h>
#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
-# if __STDC__
-# include <stdarg.h>
-# define VA_START(args, lastarg) va_start(args, lastarg)
-# else
-# include <varargs.h>
-# define VA_START(args, lastarg) va_start(args)
-# endif
+# include <stdarg.h>
+# define VA_START(args, lastarg) va_start(args, lastarg)
#else
# define va_alist a1, a2, a3, a4, a5, a6, a7, a8
# define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8;
/* fsusage.c -- return space usage of mounted filesystems
- Copyright (C) 1991, 1992, 1996, 1998, 1999, 2002 Free Software
- Foundation, Inc.
+
+ Copyright (C) 1991, 1992, 1996, 1998, 1999, 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
#include <sys/stat.h>
#include "fsusage.h"
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
-#ifndef CHAR_BIT
-# define CHAR_BIT 8
-#endif
+#include <limits.h>
int statfs ();
# include <stdlib.h>
#endif
+#include <limits.h>
#include <stdbool.h>
#include <stdio.h>
unsigned
hash_string (const char *string, unsigned n_buckets)
{
-# ifndef CHAR_BIT
-# define CHAR_BIT 8
-# endif
# define ROTATE_LEFT(Value, Shift) \
((Value) << (Shift) | (Value) >> ((sizeof (unsigned) * CHAR_BIT) - (Shift)))
# define HASH_ONE_CHAR(Value, Byte) \
/* human.c -- print human readable file size
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software
- Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 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
#include <sys/types.h>
#include <stdio.h>
-
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
+#include <limits.h>
#if HAVE_STRING_H
# include <string.h>
# include <strings.h>
#endif
-#ifndef CHAR_BIT
-# define CHAR_BIT 8
-#endif
#if HAVE_STDLIB_H
# include <stdlib.h>
#endif
/* modechange.c -- file mode manipulation
- Copyright (C) 1989, 1990, 1997, 1998, 1999, 2001 Free Software Foundation, Inc.
+
+ Copyright (C) 1989, 1990, 1997, 1998, 1999, 2001, 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
#include "modechange.h"
#include <sys/stat.h>
#include "xstrtol.h"
+#include <stddef.h>
#if STDC_HEADERS
# include <stdlib.h>
char *malloc ();
#endif
-#ifndef NULL
-# define NULL 0
-#endif
-
#if STAT_MACROS_BROKEN
# undef S_ISDIR
#endif
/* Define PATH_MAX somehow. Requires sys/types.h.
- Copyright (C) 1992, 1999, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1999, 2001, 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
/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
PATH_MAX but might cause redefinition warnings when sys/param.h is
later included (as on MORE/BSD 4.3). */
-# if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__)
+# if defined _POSIX_VERSION || !defined __GNUC__
# include <limits.h>
# endif
# include <config.h>
#endif
-#if HAVE_STDDEF_H
-# include <stddef.h> /* For the definition of size_t on windows w/MSVC. */
-#endif
-#include <sys/types.h>
#include "quotearg.h"
#include "quote.h"
/* Determine whether string value is affirmation or negative response
according to current locale's data.
- Copyright (C) 1996, 1998, 2000, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1998, 2000, 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
# include <config.h>
#endif
+#include <stddef.h>
#if STDC_HEADERS || _LIBC
-# include <stddef.h>
# include <stdlib.h>
-#else
-# ifndef NULL
-# define NULL 0
-# endif
#endif
#if ENABLE_NLS
# include <sys/types.h>
-# if HAVE_LIMITS_H
-# include <limits.h>
-# endif
+# include <limits.h>
# include <regex.h>
# include "gettext.h"
# define _(msgid) gettext (msgid)
#include <limits.h>
-#ifndef CHAR_BIT
-# define CHAR_BIT 8
-#endif
-
-/* The extra casts work around common compiler bugs. */
-#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
-/* The outer cast is needed to work around a bug in Cray C 5.0.3.0.
- It is necessary at least when t == time_t. */
-#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \
- ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0))
-#define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t)))
-
-#ifndef INT_MAX
-# define INT_MAX TYPE_MAXIMUM (int)
-#endif
-
#ifdef SAFE_WRITE
# define safe_rw safe_write
# define rw write
/* savedir.c -- save the list of files in a directory in a string
- Copyright 1990, 1997, 1998, 1999, 2000, 2001 Free Software
+ Copyright 1990, 1997, 1998, 1999, 2000, 2001, 2003 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
# include <stdlib.h>
# include <string.h>
#endif
-#ifndef NULL
-# define NULL 0
-#endif
+#include <stddef.h>
#include "savedir.h"
#include "xalloc.h"
/* tempname.c - generate the name of a temporary file.
Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2000, 2001, 2002 Free Software Foundation, Inc.
+ 2000, 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
# define __GT_NOCREATE 3
#endif
+#include <stddef.h>
+
#if STDC_HEADERS || _LIBC
-# include <stddef.h>
# include <string.h>
#endif
# include <sys/param.h>
#endif
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
+#include <limits.h>
#if HAVE_STRING_H
# include <string.h>
# define endpwent() ((void) 0)
#endif
-#ifndef CHAR_BIT
-# define CHAR_BIT 8
-#endif
-
/* The extra casts work around common compiler bugs. */
#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
/* The outer cast is needed to work around a bug in Cray C 5.0.3.0.
/* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage
- Copyright 2001 Free Software Foundation, Inc.
+ Copyright (C) 2001, 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
extern int errno;
#endif
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
+#include <limits.h>
#if HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
/* A more useful interface to strtol.
- Copyright (C) 1995, 1996, 1998-2001 Free Software Foundation, Inc.
+
+ Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 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
extern int errno;
#endif
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
-
-#ifndef CHAR_BIT
-# define CHAR_BIT 8
-#endif
+#include <limits.h>
/* The extra casts work around common compiler bugs. */
#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
-/* The outer cast is needed to work around a bug in Cray C 5.0.3.0.
- It is necessary at least when t == time_t. */
-#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \
- ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0))
-#define TYPE_MAXIMUM(t) (~ (t) 0 - TYPE_MINIMUM (t))
#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
# define IN_CTYPE_DOMAIN(c) 1
+2003-05-28 Paul Eggert <eggert@twinsun.com>
+
+ Assume the headers required for C89 freestanding compilers.
+ * backupfile.m4 (gl_BACKUPFILE): Don't check for limits.h.
+ * fsusage.m4 (gl_PREREQ_FSUSAGE_EXTRA): Likewise.
+ * human.m4 (gl_HUMAN): Likewise.
+ * pathmax.m4 (gl_PATHMAX): Likewise.
+ * rpmatch.m4 (gl_FUNC_RPMATCH): Likewise.
+ * userspec.m4 (gl_USERSPEC): Likewise.
+ * xreadlink.m4 (gl_XREADLINK): Likewise.
+ * m4/xstrtol.m4 (gl_PREREQ_XSTRTOL): Likewise.
+ * quote.m4 (gl_QUOTE): Don't check for stddef.h.
+
2003-05-26 Jim Meyering <jim@meyering.net>
Merge in a change from coreutils:
-# backupfile.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# backupfile.m4 serial 2
+dnl Copyright (C) 2002, 2003 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 Prerequisites of lib/backupfile.c.
AC_REQUIRE([AC_HEADER_DIRENT])
AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID])
- AC_CHECK_HEADERS_ONCE(limits.h stdlib.h string.h)
+ AC_CHECK_HEADERS_ONCE(stdlib.h string.h)
AC_CHECK_DECLS_ONCE(getenv malloc)
jm_CHECK_TYPE_STRUCT_DIRENT_D_INO
dnl Prerequisites of lib/addext.c.
AC_REQUIRE([jm_AC_DOS])
AC_SYS_LONG_FILE_NAMES
- AC_CHECK_HEADERS_ONCE(limits.h string.h unistd.h)
+ AC_CHECK_HEADERS_ONCE(string.h unistd.h)
AC_CHECK_FUNCS(pathconf)
])
-#serial 9
+#serial 10
# From fileutils/configure.in
AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA],
[
AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
- AC_CHECK_HEADERS_ONCE(fcntl.h limits.h)
+ AC_CHECK_HEADERS_ONCE(fcntl.h)
AC_CHECK_HEADERS(dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h sys/statvfs.h)
jm_STATFS_TRUNCATES
])
-# human.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# human.m4 serial 2
+dnl Copyright (C) 2002, 2003 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
AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
dnl Prerequisites of lib/human.c.
- AC_CHECK_HEADERS_ONCE(limits.h stdlib.h string.h)
+ AC_CHECK_HEADERS_ONCE(stdlib.h string.h)
AC_CHECK_DECLS_ONCE([getenv])
])
-# pathmax.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# pathmax.m4 serial 2
+dnl Copyright (C) 2002, 2003 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
AC_DEFUN([gl_PATHMAX],
[
dnl Prerequisites of lib/pathmax.h.
- AC_CHECK_HEADERS_ONCE(limits.h sys/param.h unistd.h)
+ AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h)
])
-# quote.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# quote.m4 serial 2
+dnl Copyright (C) 2002, 2003 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
AC_DEFUN([gl_QUOTE],
[
dnl Prerequisites of lib/quote.c.
- AC_CHECK_HEADERS_ONCE(stddef.h)
+ dnl (none)
])
-# rpmatch.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# rpmatch.m4 serial 2
+dnl Copyright (C) 2002, 2003 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
# Prerequisites of lib/rpmatch.c.
AC_DEFUN([gl_PREREQ_RPMATCH], [
AC_REQUIRE([AC_HEADER_STDC])
- AC_CHECK_HEADERS_ONCE(limits.h)
])
-# userspec.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# userspec.m4 serial 2
+dnl Copyright (C) 2002, 2003 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 Prerequisites of lib/userspec.c.
AC_REQUIRE([AC_HEADER_STDC])
AC_REQUIRE([AC_FUNC_ALLOCA])
- AC_CHECK_HEADERS_ONCE(limits.h string.h sys/param.h unistd.h)
+ AC_CHECK_HEADERS_ONCE(string.h sys/param.h unistd.h)
])
-# xreadlink.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# xreadlink.m4 serial 2
+dnl Copyright (C) 2002, 2003 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
AC_DEFUN([gl_XREADLINK],
[
dnl Prerequisites of lib/xreadlink.c.
- AC_CHECK_HEADERS_ONCE(limits.h stdlib.h sys/types.h unistd.h)
+ AC_CHECK_HEADERS_ONCE(stdlib.h sys/types.h unistd.h)
])
-# xstrtol.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# xstrtol.m4 serial 2
+dnl Copyright (C) 2002, 2003 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
[
AC_REQUIRE([gl_PREREQ_XSTRTOL_H])
AC_REQUIRE([AC_HEADER_STDC])
- AC_CHECK_HEADERS_ONCE(limits.h string.h)
+ AC_CHECK_HEADERS_ONCE(string.h)
AC_CHECK_FUNCS_ONCE(isascii)
AC_CHECK_DECLS_ONCE(strtol strtoul)
AC_CHECK_DECLS([strtoimax, strtoumax])